X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fopenldap.m4;h=67f78e09d6e1e66ecfb26877d98d05110796f69c;hb=7434c31079f3d9261399f2c705aae5a5543aca57;hp=411c6420d7e4e719de584ea39c08a42e5b55dcf2;hpb=54b633f3a742eb6dee9c5e7b00c53fb929327084;p=openldap

diff --git a/build/openldap.m4 b/build/openldap.m4
index 411c6420d7..67f78e09d6 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -35,7 +35,7 @@ AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
 	ol_enable_$1="$ol_arg"
 ]ifelse($3,--,,[,
 [	ol_enable_$1=ifelse($3,,"auto","$3")]]))dnl
-dnl AC_VERBOSE(OpenLDAP -enable-$1 $ol_enable_$1)
+dnl AC_MSG_RESULT([OpenLDAP -enable-$1 $ol_enable_$1])
 # end --enable-$1
 ])dnl
 dnl
@@ -60,7 +60,7 @@ AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
 	ol_with_$1="$ol_arg"
 ],
 [	ol_with_$1=ifelse($3,,"no","$3")])dnl
-dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_with_$1)
+dnl AC_MSG_RESULT([OpenLDAP --with-$1 $ol_with_$1])
 # end --with-$1
 ])dnl
 dnl
@@ -76,11 +76,11 @@ changequote([, ])dnl
 AC_MSG_CHECKING(size of $1) 
 AC_CACHE_VAL(AC_CV_NAME, 
 [for ac_size in 4 8 1 2 16 $2 ; do # List sizes in rough order of prevalence. 
-  AC_TRY_COMPILE([#include "confdefs.h" 
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "confdefs.h" 
 #include <stdlib.h>
 #include <sys/types.h> 
 $2 
-], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size) 
+]], [[switch (0) case 0: case (sizeof ($1) == $ac_size):;]])],[AC_CV_NAME=$ac_size],[]) 
   if test x$AC_CV_NAME != x ; then break; fi 
 done 
 ]) 
@@ -160,13 +160,11 @@ dnl ====================================================================
 dnl Check if system uses EBCDIC instead of ASCII
 AC_DEFUN([OL_CPP_EBCDIC], [# test for EBCDIC
 AC_CACHE_CHECK([for EBCDIC],ol_cv_cpp_ebcdic,[
-	AC_TRY_CPP([
+	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 #if !('M' == 0xd4)
 #include <__ASCII__/generate_error.h>
 #endif
-],
-	[ol_cv_cpp_ebcdic=yes],
-	[ol_cv_cpp_ebcdic=no])])
+]])],[ol_cv_cpp_ebcdic=yes],[ol_cv_cpp_ebcdic=no])])
 if test $ol_cv_cpp_ebcdic = yes ; then
 	AC_DEFINE(HAVE_EBCDIC,1, [define if system uses EBCDIC instead of ASCII])
 fi
@@ -178,10 +176,10 @@ AC_DEFUN([OL_HEADER_STDC],
 [AC_REQUIRE_CPP()dnl
 AC_REQUIRE([OL_CPP_EBCDIC])dnl
 AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,
-[AC_TRY_CPP([#include <stdlib.h>
+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <float.h>], ol_cv_header_stdc=yes, ol_cv_header_stdc=no)
+#include <float.h>]])],[ol_cv_header_stdc=yes],[ol_cv_header_stdc=no])
 
 if test $ol_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -195,7 +193,7 @@ fi
 
 if test $ol_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-AC_TRY_RUN([#include <ctype.h>
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
 #ifndef HAVE_EBCDIC
 #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -209,7 +207,7 @@ AC_TRY_RUN([#include <ctype.h>
 int main () { int i; for (i = 0; i < 256; i++)
 if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
-], , ol_cv_header_stdc=no, :)
+]])],[],[ol_cv_header_stdc=no],[:])
 fi])
 if test $ol_cv_header_stdc = yes; then
   AC_DEFINE(STDC_HEADERS)
@@ -221,12 +219,10 @@ dnl ====================================================================
 dnl Check if struct passwd has pw_gecos
 AC_DEFUN([OL_STRUCT_PASSWD_PW_GECOS], [# test for pw_gecos in struct passwd
 AC_CACHE_CHECK([struct passwd for pw_gecos],ol_cv_struct_passwd_pw_gecos,[
-	AC_TRY_COMPILE([#include <pwd.h>],[
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pwd.h>]], [[
 	struct passwd pwd;
 	pwd.pw_gecos = pwd.pw_name;
-],
-	[ol_cv_struct_passwd_pw_gecos=yes],
-	[ol_cv_struct_passwd_pw_gecos=no])])
+]])],[ol_cv_struct_passwd_pw_gecos=yes],[ol_cv_struct_passwd_pw_gecos=no])])
 if test $ol_cv_struct_passwd_pw_gecos = yes ; then
 	AC_DEFINE(HAVE_PW_GECOS,1, [define if struct passwd has pw_gecos])
 fi
@@ -236,12 +232,10 @@ dnl --------------------------------------------------------------------
 dnl Check if struct passwd has pw_passwd
 AC_DEFUN([OL_STRUCT_PASSWD_PW_PASSWD], [# test for pw_passwd in struct passwd
 AC_CACHE_CHECK([struct passwd for pw_passwd],ol_cv_struct_passwd_pw_passwd,[
-	AC_TRY_COMPILE([#include <pwd.h>],[
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pwd.h>]], [[
 	struct passwd pwd;
 	pwd.pw_passwd = pwd.pw_name;
-],
-	[ol_cv_struct_passwd_pw_passwd=yes],
-	[ol_cv_struct_passwd_pw_passwd=no])])
+]])],[ol_cv_struct_passwd_pw_passwd=yes],[ol_cv_struct_passwd_pw_passwd=no])])
 if test $ol_cv_struct_passwd_pw_passwd = yes ; then
 	AC_DEFINE(HAVE_PW_PASSWD,1, [define if struct passwd has pw_passwd])
 fi
@@ -257,7 +251,7 @@ AC_DEFUN([OL_RESOLVER_TRY],
 	ol_LIBS=$LIBS
 	LIBS="$ol_RESOLVER_LIB $LIBS"
 
-	AC_TRY_LINK([
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -268,7 +262,7 @@ AC_DEFUN([OL_RESOLVER_TRY],
 #ifdef HAVE_RESOLV_H
 #	include <resolv.h>
 #endif
-],[{
+]], [[{
 	int len, status;
 	char *request = NULL;
 	unsigned char reply[64*1024];
@@ -297,7 +291,7 @@ AC_DEFUN([OL_RESOLVER_TRY],
 	p += sizeof(HEADER);
 #endif
 	status = dn_expand( reply, reply+len, p, host, sizeof(host));
-}],[$1=yes],[$1=no])
+}]])],[$1=yes],[$1=no])
 
 	LIBS="$ol_LIBS"
 ])
@@ -329,7 +323,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY],
 	ol_LIBS=$LIBS
 	LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
-	AC_TRY_LINK([
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_DB_185_H
 # include <db_185.h>
 #else
@@ -343,7 +337,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY],
 #ifndef NULL
 #define NULL ((void*)0)
 #endif
-],[
+]], [[
 #if DB_VERSION_MAJOR > 1
 	{
 		char *version;
@@ -369,7 +363,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY],
 #else
 	(void) dbopen( NULL, 0, 0, 0, NULL);
 #endif
-],[$1=yes],[$1=no])
+]])],[$1=yes],[$1=no])
 
 	LIBS="$ol_LIBS"
 ])
@@ -418,7 +412,7 @@ AC_DEFUN([OL_BERKELEY_DB_VERSION],
 		LIBS="$ol_cv_lib_db $LIBS"
 	fi
 
-	AC_TRY_RUN([
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifdef HAVE_DB_185_H
 	choke me;
 #else
@@ -450,10 +444,7 @@ main()
 #endif
 
 	return 0;
-}],
-	[ol_cv_berkeley_db_version=yes],
-	[ol_cv_berkeley_db_version=no],
-	[ol_cv_berkeley_db_version=cross])
+}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross])
 
 	LIBS="$ol_LIBS"
 ])
@@ -473,7 +464,7 @@ AC_DEFUN([OL_BERKELEY_DB_THREAD],
 		LIBS="$ol_cv_lib_db $LIBS"
 	fi
 
-	AC_TRY_RUN([
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifdef HAVE_DB_185_H
 	choke me;
 #else
@@ -536,10 +527,7 @@ main()
 #endif
 
 	return rc;
-}],
-	[ol_cv_berkeley_db_thread=yes],
-	[ol_cv_berkeley_db_thread=no],
-	[ol_cv_berkeley_db_thread=cross])
+}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross])
 
 	LIBS="$ol_LIBS"
 ])
@@ -567,7 +555,7 @@ fi
 dnl --------------------------------------------------------------------
 dnl Check for version compatility with back-bdb
 AC_DEFUN([OL_BDB_COMPAT],
-[AC_CACHE_CHECK([Berkeley DB version for BDB backend], [ol_cv_bdb_compat],[
+[AC_CACHE_CHECK([Berkeley DB version for BDB/HDB backends], [ol_cv_bdb_compat],[
 	AC_EGREP_CPP(__db_version_compat,[
 #include <db.h>
 
@@ -788,11 +776,11 @@ dnl Draft 9 and 10 are equivalent for our purposes.
 dnl
 AC_DEFUN([OL_POSIX_THREAD_VERSION],
 [AC_CACHE_CHECK([POSIX thread version],[ol_cv_pthread_version],[
-	AC_TRY_COMPILE([
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #		include <pthread.h>
-	],[
+	]], [[
 		int i = PTHREAD_CREATE_JOINABLE;
-	],[
+	]])],[
 	AC_EGREP_HEADER(pthread_detach,pthread.h,
 	ol_cv_pthread_version=10, ol_cv_pthread_version=8)],[
 	AC_EGREP_CPP(draft7,[
@@ -813,8 +801,8 @@ AC_DEFUN([OL_POSIX_THREAD_VERSION],
 ])dnl
 dnl
 dnl --------------------------------------------------------------------
-AC_DEFUN([OL_PTHREAD_TEST_INCLUDES],
-[/* pthread test headers */
+AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[
+/* pthread test headers */
 #include <pthread.h>
 #if HAVE_PTHREADS < 7
 #include <errno.h>
@@ -828,8 +816,8 @@ static void *task(p)
 {
 	return (void *) (p == NULL);
 }
-])
-AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[
+]])
+AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
 	/* pthread test function */
 #ifndef PTHREAD_CREATE_DETACHED
 #define	PTHREAD_CREATE_DETACHED	1
@@ -875,7 +863,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[
 #endif
 
 	return 0;
-])
+]])
 
 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
 [OL_PTHREAD_TEST_INCLUDES
@@ -896,8 +884,9 @@ if test "$ol_link_threads" = no ; then
 		ol_LIBS="$LIBS"
 		LIBS="$1 $LIBS"
 
-		AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
-			[$2=yes], [$2=no],
+		AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM],
+			[$2=yes],
+			[$2=no],
 			[AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION,
 				[$2=yes], [$2=no])])
 
@@ -998,7 +987,7 @@ dnl ====================================================================
 dnl Check for POSIX Regex
 AC_DEFUN([OL_POSIX_REGEX], [
 AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
-	AC_TRY_RUN([
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <regex.h>
 static char *pattern, *string;
@@ -1020,17 +1009,14 @@ main()
 	regfree(&re);
 
 	return rc;
-}],
-	[ol_cv_c_posix_regex=yes],
-	[ol_cv_c_posix_regex=no],
-	[ol_cv_c_posix_regex=cross])])
+}]])],[ol_cv_c_posix_regex=yes],[ol_cv_c_posix_regex=no],[ol_cv_c_posix_regex=cross])])
 ])
 dnl
 dnl ====================================================================
 dnl Check if toupper() requires islower() to be called first
 AC_DEFUN([OL_C_UPPER_LOWER],
 [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
-	AC_TRY_RUN([
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <ctype.h>
 main()
 {
@@ -1038,10 +1024,7 @@ main()
 		exit(0);
 	else
 		exit(1);
-}],
-	[ol_cv_c_upper_lower=no],
-	[ol_cv_c_upper_lower=yes],
-	[ol_cv_c_upper_lower=safe])])
+}]])],[ol_cv_c_upper_lower=no],[ol_cv_c_upper_lower=yes],[ol_cv_c_upper_lower=safe])])
 if test $ol_cv_c_upper_lower != no ; then
 	AC_DEFINE(C_UPPER_LOWER,1, [define if toupper() requires islower()])
 fi
@@ -1055,17 +1038,14 @@ dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration.
 dnl Reported by Keith Bostic.
 AC_DEFUN([OL_SYS_ERRLIST],
 [AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[
-	AC_TRY_COMPILE([
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
 #ifdef WINNT
 #include <stdlib.h>
-#endif ],
-	[char *c = (char *) *sys_errlist],
-	[ol_cv_dcl_sys_errlist=yes
-	ol_cv_have_sys_errlist=yes],
-	[ol_cv_dcl_sys_errlist=no])])
+#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes
+	ol_cv_have_sys_errlist=yes],[ol_cv_dcl_sys_errlist=no])])
 #
 # It's possible (for near-UNIX clones) that sys_errlist doesn't exist
 if test $ol_cv_dcl_sys_errlist = no ; then
@@ -1073,10 +1053,7 @@ if test $ol_cv_dcl_sys_errlist = no ; then
 		[define if sys_errlist is not declared in stdio.h or errno.h])
 
 	AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[
-		AC_TRY_LINK([#include <errno.h>],
-			[char *c = (char *) *sys_errlist],
-			[ol_cv_have_sys_errlist=yes],
-			[ol_cv_have_sys_errlist=no])])
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])])
 fi
 if test $ol_cv_have_sys_errlist = yes ; then
 	AC_DEFINE(HAVE_SYS_ERRLIST,1,
@@ -1089,21 +1066,20 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
 		ol_decl_strerror_r=yes, ol_decl_strerror_r=no)dnl
 
 	if test $ol_decl_strerror_r = yes ; then
-		AC_TRY_COMPILE([#include <string.h>],
-			[   /* from autoconf 2.59 */
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[   /* from autoconf 2.59 */
 				char buf[100];
 				char x = *strerror_r (0, buf, sizeof buf);
 				char *p = strerror_r (0, buf, sizeof buf);
-			], ol_cv_nonposix_strerror_r=yes, ol_cv_nonposix_strerror_r=no)
+			]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
 	else
-		AC_TRY_RUN([
+		AC_RUN_IFELSE([AC_LANG_SOURCE([[
 			main() {
 				char buf[100];
 				buf[0] = 0;
 				strerror_r( 1, buf, sizeof buf );
 				exit( buf[0] == 0 );
 			}
-			], ol_cv_nonposix_strerror_r=yes, ol_cv_nonposix_strerror=no, ol_cv_nonposix_strerror=no)
+			]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror=no],[ol_cv_nonposix_strerror=no])
 	fi
 	])
 if test $ol_cv_nonposix_strerror_r = yes ; then
@@ -1128,10 +1104,9 @@ dnl "int x; int *volatile a = &x; *a = 0;"
 dnl 	-- borrowed from PDKSH
 AC_DEFUN([OL_C_VOLATILE],
  [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,
-    [AC_TRY_COMPILE([int x, y, z;],
-      [volatile int a; int * volatile b = x ? &y : &z;
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int x, y, z;]], [[volatile int a; int * volatile b = x ? &y : &z;
       /* Older MIPS compilers (eg., in Ultrix 4.2) don't like *b = 0 */
-      *b = 0;], ol_cv_c_volatile=yes, ol_cv_c_volatile=no)])
+      *b = 0;]])],[ol_cv_c_volatile=yes],[ol_cv_c_volatile=no])])
   if test $ol_cv_c_volatile = yes; then
     : 
   else
@@ -1145,13 +1120,10 @@ AC_DEFUN([OL_LIB_FETCH],
 [ol_LIBS=$LIBS
 LIBS="-lfetch -lcom_err $LIBS"
 AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[
-	AC_TRY_LINK([
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/param.h>
 #include <stdio.h>
-#include <fetch.h>],
-	[struct url *u = fetchParseURL("file:///"); ],
-	[ol_cv_lib_fetch=yes],
-	[ol_cv_lib_fetch=no])])
+#include <fetch.h>]], [[struct url *u = fetchParseURL("file:///"); ]])],[ol_cv_lib_fetch=yes],[ol_cv_lib_fetch=no])])
 LIBS=$ol_LIBS
 if test $ol_cv_lib_fetch != no ; then
 	ol_link_fetch="-lfetch -lcom_err"
@@ -1164,8 +1136,7 @@ dnl ====================================================================
 dnl Define sig_atomic_t if not defined in signal.h
 AC_DEFUN([OL_TYPE_SIG_ATOMIC_T],
  [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,
-    [AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
-		ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sig_atomic_t atomic;]])],[ol_cv_type_sig_atomic_t=yes],[ol_cv_type_sig_atomic_t=no])])
   if test $ol_cv_type_sig_atomic_t = no; then
     AC_DEFINE(sig_atomic_t,int,
 		[define to atomic type if sig_atomic_t is not available])
@@ -1176,15 +1147,14 @@ dnl ====================================================================
 dnl Define socklen_t if not defined in sys/types.h or sys/socket.h
 AC_DEFUN([OL_TYPE_SOCKLEN_T],
  [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,
-    [AC_TRY_COMPILE([
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-], [socklen_t len;],
-		ol_cv_type_socklen_t=yes, ol_cv_type_socklen_t=no)])
+]], [[socklen_t len;]])],[ol_cv_type_socklen_t=yes],[ol_cv_type_socklen_t=no])])
   if test $ol_cv_type_socklen_t = no; then
     AC_DEFINE(socklen_t, int,
 		[define to int if socklen_t is not available])
@@ -1195,7 +1165,7 @@ dnl ====================================================================
 dnl Define inet_aton is available
 AC_DEFUN([OL_FUNC_INET_ATON],
  [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,
-    [AC_TRY_LINK([
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -1209,9 +1179,8 @@ AC_DEFUN([OL_FUNC_INET_ATON],
 #		include <arpa/inet.h>
 #	endif
 #endif
-], [struct in_addr in;
-int rc = inet_aton( "255.255.255.255", &in );],
-		ol_cv_func_inet_aton=yes, ol_cv_func_inet_aton=no)])
+]], [[struct in_addr in;
+int rc = inet_aton( "255.255.255.255", &in );]])],[ol_cv_func_inet_aton=yes],[ol_cv_func_inet_aton=no])])
   if test $ol_cv_func_inet_aton != no; then
     AC_DEFINE(HAVE_INET_ATON, 1,
 		[define to you inet_aton(3) is available])
@@ -1222,15 +1191,9 @@ dnl ====================================================================
 dnl check no of arguments for ctime_r
 AC_DEFUN([OL_FUNC_CTIME_R_NARGS],
  [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,
-   [AC_TRY_COMPILE([#include <time.h>],
-		[time_t ti; char *buffer; ctime_r(&ti,buffer,32);],
-			ol_cv_func_ctime_r_nargs3=yes,
-			ol_cv_func_ctime_r_nargs3=no)
+   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[time_t ti; char *buffer; ctime_r(&ti,buffer,32);]])],[ol_cv_func_ctime_r_nargs3=yes],[ol_cv_func_ctime_r_nargs3=no])
 
-	AC_TRY_COMPILE([#include <time.h>],
-		[time_t ti; char *buffer; ctime_r(&ti,buffer);],
-			ol_cv_func_ctime_r_nargs2=yes,
-			ol_cv_func_ctime_r_nargs2=no)
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[time_t ti; char *buffer; ctime_r(&ti,buffer);]])],[ol_cv_func_ctime_r_nargs2=yes],[ol_cv_func_ctime_r_nargs2=no])
 
 	if test $ol_cv_func_ctime_r_nargs3 = yes -a \
 		$ol_cv_func_ctime_r_nargs2 = no ; then
@@ -1257,9 +1220,7 @@ dnl --------------------------------------------------------------------
 dnl check return type of ctime_r()
 AC_DEFUN([OL_FUNC_CTIME_R_TYPE],
  [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,
-   [AC_TRY_COMPILE([#include <time.h>],
-		[extern int (ctime_r)();],
-			ol_cv_func_ctime_r_type="int", ol_cv_func_ctime_r_type="charp")
+   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[extern int (ctime_r)();]])],[ol_cv_func_ctime_r_type="int"],[ol_cv_func_ctime_r_type="charp"])
 	])
   if test $ol_cv_func_ctime_r_type = "int" ; then
 	AC_DEFINE(CTIME_R_RETURNS_INT,1, [define if ctime_r() returns int])
@@ -1270,30 +1231,24 @@ dnl check no of arguments for gethostbyname_r
 AC_DEFUN([OL_FUNC_GETHOSTBYNAME_R_NARGS],
  [AC_CACHE_CHECK(number of arguments of gethostbyname_r,
 	ol_cv_func_gethostbyname_r_nargs,
-	[AC_TRY_COMPILE([#include <sys/types.h>
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#define BUFSIZE (sizeof(struct hostent)+10)],
-		[struct hostent hent; char buffer[BUFSIZE];
+#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent; char buffer[BUFSIZE];
 		int bufsize=BUFSIZE;int h_errno;
 		(void)gethostbyname_r("segovia.cs.purdue.edu", &hent,
-			buffer, bufsize, &h_errno);],
-		ol_cv_func_gethostbyname_r_nargs5=yes, 
-		ol_cv_func_gethostbyname_r_nargs5=no)
+			buffer, bufsize, &h_errno);]])],[ol_cv_func_gethostbyname_r_nargs5=yes],[ol_cv_func_gethostbyname_r_nargs5=no])
 
-	AC_TRY_COMPILE([#include <sys/types.h>
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#define BUFSIZE (sizeof(struct hostent)+10)],
-		[struct hostent hent;struct hostent *rhent;
+#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent;struct hostent *rhent;
 		char buffer[BUFSIZE];
 		int bufsize=BUFSIZE;int h_errno;
 		(void)gethostbyname_r("localhost", &hent, buffer, bufsize,
-			&rhent, &h_errno);],
-		ol_cv_func_gethostbyname_r_nargs6=yes,
-		ol_cv_func_gethostbyname_r_nargs6=no)
+			&rhent, &h_errno);]])],[ol_cv_func_gethostbyname_r_nargs6=yes],[ol_cv_func_gethostbyname_r_nargs6=no])
 
 	if test $ol_cv_func_gethostbyname_r_nargs5 = yes -a \
 		$ol_cv_func_gethostbyname_r_nargs6 = no ; then
@@ -1320,35 +1275,29 @@ dnl check no of arguments for gethostbyaddr_r
 AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
  [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,
 	[ol_cv_func_gethostbyaddr_r_nargs],
-	[AC_TRY_COMPILE([#include <sys/types.h>
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#define BUFSIZE (sizeof(struct hostent)+10)],
-	   [struct hostent hent; char buffer[BUFSIZE]; 
+#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent; char buffer[BUFSIZE]; 
 	    struct in_addr add;
 	    size_t alen=sizeof(struct in_addr);
 	    int bufsize=BUFSIZE;int h_errno;
 		(void)gethostbyaddr_r( (void *)&(add.s_addr),
-			alen, AF_INET, &hent, buffer, bufsize, &h_errno);],
-		ol_cv_func_gethostbyaddr_r_nargs7=yes,
-		ol_cv_func_gethostbyaddr_r_nargs7=no)
+			alen, AF_INET, &hent, buffer, bufsize, &h_errno);]])],[ol_cv_func_gethostbyaddr_r_nargs7=yes],[ol_cv_func_gethostbyaddr_r_nargs7=no])
 
-	AC_TRY_COMPILE([#include <sys/types.h>
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#define BUFSIZE (sizeof(struct hostent)+10)],
-		[struct hostent hent;
+#define BUFSIZE (sizeof(struct hostent)+10)]], [[struct hostent hent;
 		struct hostent *rhent; char buffer[BUFSIZE]; 
 		struct in_addr add;
 		size_t alen=sizeof(struct in_addr);
 		int bufsize=BUFSIZE;int h_errno;
 		(void)gethostbyaddr_r( (void *)&(add.s_addr),
 			alen, AF_INET, &hent, buffer, bufsize, 
-			&rhent, &h_errno);],
-		ol_cv_func_gethostbyaddr_r_nargs8=yes,
-		ol_cv_func_gethostbyaddr_r_nargs8=no)
+			&rhent, &h_errno);]])],[ol_cv_func_gethostbyaddr_r_nargs8=yes],[ol_cv_func_gethostbyaddr_r_nargs8=no])
 
 	if test $ol_cv_func_gethostbyaddr_r_nargs7 = yes -a \
 		$ol_cv_func_gethostbyaddr_r_nargs8 = no ; then
@@ -1395,9 +1344,7 @@ dnl ====================================================================
 dnl check for msg_accrights in msghdr
 AC_DEFUN([OL_MSGHDR_MSG_ACCRIGHTS],
  [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
-   [AC_TRY_COMPILE([#include <sys/socket.h>],
-		[struct msghdr m; m.msg_accrightslen=0],
-		ol_cv_msghdr_msg_accrights=yes, ol_cv_msghdr_msg_accrights=no)
+   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[struct msghdr m; m.msg_accrightslen=0]])],[ol_cv_msghdr_msg_accrights=yes],[ol_cv_msghdr_msg_accrights=no])
 	])
   if test $ol_cv_msghdr_msg_accrights = "yes" ; then
 	AC_DEFINE(HAVE_MSGHDR_MSG_ACCRIGHTS,1,
@@ -1408,9 +1355,7 @@ dnl ====================================================================
 dnl check for cmsghdr
 AC_DEFUN([OL_MSGHDR_MSG_CONTROL],
  [AC_CACHE_CHECK(for msg_control in msghdr, ol_cv_msghdr_msg_control,
-   [AC_TRY_COMPILE([#include <sys/socket.h>],
-		[struct msghdr m; m.msg_control=(struct cmsghdr *)0],
-		ol_cv_msghdr_msg_control=yes, ol_cv_msghdr_msg_control=no)
+   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[struct msghdr m; m.msg_control=(struct cmsghdr *)0]])],[ol_cv_msghdr_msg_control=yes],[ol_cv_msghdr_msg_control=no])
 	])
   if test $ol_cv_msghdr_msg_control = "yes" ; then
 	AC_DEFINE(HAVE_MSGHDR_MSG_CONTROL,1,