[PATCH] Fix warnings issued by autoconf 2.68+

Gbp-Pq: Name Fix-warnings-issued-by-autoconf-2.68.patch

diff --git a/build/openldap.m4 b/build/openldap.m4
index 702221c1985c824aeccd05f3e9bedbe71eab9c77..8e4c76f4e130894772ba392fde6104230c144233 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -294,13 +294,13 @@ dnl --------------------------------------------------------------------
 dnl Get major and minor version from <db.h>
 AC_DEFUN([OL_BDB_HEADER_VERSION],
 [AC_CACHE_CHECK([for Berkeley DB major version in db.h], [ol_cv_bdb_major],[
-       AC_LANG_CONFTEST([
+       AC_LANG_CONFTEST([AC_LANG_SOURCE([
 #include <db.h>
 #ifndef DB_VERSION_MAJOR
 #      define DB_VERSION_MAJOR 1
 #endif
 __db_version DB_VERSION_MAJOR
-])
+])])
        set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
        ol_cv_bdb_major=${3}
 ])
@@ -310,13 +310,13 @@ esac
 
 dnl Determine minor version
 AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
-       AC_LANG_CONFTEST([
+       AC_LANG_CONFTEST([AC_LANG_SOURCE([
 #include <db.h>
 #ifndef DB_VERSION_MINOR
 #      define DB_VERSION_MINOR 0
 #endif
 __db_version DB_VERSION_MINOR
-])
+])])
        set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
        ol_cv_bdb_minor=${3}
 ])
@@ -651,7 +651,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
 ]])
 
 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+[AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
 
 int main(argc, argv)
        int argc;
@@ -659,7 +659,7 @@ int main(argc, argv)
 {
 OL_PTHREAD_TEST_FUNCTION
 }
-]))
+])])
 dnl --------------------------------------------------------------------
 AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2)
 if test "$ol_link_threads" = no ; then

diff --git a/configure.in b/configure.in
index 6c89a5af42eca2c4ede21a9e6be179e83c53575c..588636ede146a3113795a9b45cc5f72986f31352 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1213,11 +1213,11 @@ if test $ol_link_tls = no ; then
                AC_CHECK_HEADERS(gnutls/gnutls.h)
 
                if test $ac_cv_header_gnutls_gnutls_h = yes ; then
-                       AC_PREPROC_IFELSE(
+                       AC_PREPROC_IFELSE([AC_LANG_SOURCE(
                                [[#include <gnutls/gnutls.h>]
 [#if GNUTLS_VERSION_NUMBER < 0x020c00]
 [#error "GnuTLS 2.12.0 or newer required"]
-[#endif]],
+[#endif]])],
                                        , [AC_MSG_FAILURE([GnuTLS is too old])])
 
                        AC_CHECK_LIB(gnutls, gnutls_init,
@@ -1494,7 +1494,7 @@ pthread_rwlock_t rwlock;
                                AC_MSG_ERROR([LinuxThreads header/library mismatch]);
                        fi
 
-                       AC_CACHE_CHECK([if pthread_create() works],
+                       AC_CACHE_CHECK([AC_LANG_SOURCE([if pthread_create() works])],
                                ol_cv_pthread_create_works,[
                        AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM],
                                [ol_cv_pthread_create_works=yes],
@@ -2519,7 +2519,7 @@ if test "$ac_cv_func_getpeereid" != yes; then
                fi
                AC_CHECK_MEMBERS([struct stat.st_fstype, struct stat.st_vfstype])
                if test "$ac_cv_member_struct_stat_st_fstype" = yes; then
-                       AC_COMPILE_IFELSE([struct stat st; char *ptr=st.st_fstype;],
+                       AC_COMPILE_IFELSE([AC_LANG_SOURCE([struct stat st; char *ptr=st.st_fstype;])],
                                AC_DEFINE([HAVE_STRUCT_STAT_ST_FSTYPE_CHAR],1,[define to 1 if st_fstype is char *]),
                                AC_DEFINE([HAVE_STRUCT_STAT_ST_FSTYPE_INT],1,[define to 1 if st_fstype is int]))
                fi