From 4a600d170b0c4f271d5251488fce50642d560492 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 12 Nov 2022 04:11:41 +0000 Subject: [PATCH] Port more AC_LANG_PROGRAM to AC_LANG_SOURCE This tends to be more readable. Signed-off-by: Sam James --- configure | 146 +++++---------------------------------------------- configure.ac | 78 ++++++++++++++------------- 2 files changed, 52 insertions(+), 172 deletions(-) diff --git a/configure b/configure index 3f8daf9dad5fd8..e3864fe9ed961e 100755 --- a/configure +++ b/configure @@ -9848,15 +9848,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #else #include #endif - -int -main () -{ - - makedev(0, 0) - ; - return 0; -} +makedev(0, 0) _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -9894,15 +9886,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #elif defined(HAVE_SYS_ENDIAN_H) #include #endif - -int -main () -{ - - le64toh(1) - ; - return 0; -} +le64toh(1) _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -10729,13 +10713,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -int -main () -{ -pthread_t x; x = *(pthread_t*)0; - ; - return 0; -} + pthread_t x; x = *(pthread_t*)0; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -10837,13 +10815,8 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -int -main () -{ -pthread_key_t k; k * 1; - ; - return 0; -} + pthread_key_t k; k * 1; + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : ac_cv_pthread_key_t_is_arithmetic_type=yes @@ -12179,13 +12152,7 @@ $as_echo_n "checking for genuine AIX C++ extensions support... " >&6; } /* end confdefs.h. */ #include -int -main () -{ -loadAndInit("", 0, "") - ; - return 0; -} + loadAndInit("", 0, "") _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -13527,13 +13494,6 @@ if test "x$ac_cv_header_sqlite3_h" = xyes; then : # error "SQLite 3.7.15 or higher required" #endif -int -main () -{ - - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -14480,17 +14440,9 @@ save_LIBS=$LIBS ((TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION == 5) && (TK_RELEASE_SERIAL < 12)) # error "Tk older than 8.5.12 not supported" #endif - -int -main () -{ - void *x1 = Tcl_Init; void *x2 = Tk_Init; - ; - return 0; -} _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -14850,14 +14802,7 @@ save_LIBS=$LIBS #if DB_VERSION_MAJOR < 5 #error "dh.h: DB_VERSION_MAJOR < 5 is not supported." #endif - -int -main () -{ -DBM *dbm = dbm_open(NULL, 0, 0) - ; - return 0; -} + DBM *dbm = dbm_open(NULL, 0, 0) _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -15046,14 +14991,7 @@ $as_echo_n "checking for pthread_create in -lpthread... " >&6; } #include void * start_routine (void *arg) { exit (0); } -int -main () -{ - pthread_create (NULL, NULL, start_routine, NULL) - ; - return 0; -} _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -15444,13 +15382,8 @@ else /* AF_INET6 available check */ #include #include -int -main () -{ int domain = AF_INET6; - ; - return 0; -} + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -15482,14 +15415,9 @@ $as_echo_n "checking if RFC2553 API is available... " >&6; } #include #include -int -main () -{ struct sockaddr_in6 x; - x.sin6_scope_id; - ; - return 0; -} +x.sin6_scope_id; + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -19617,16 +19545,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #else #include #endif +makedev(major(0),minor(0)); -int -main () -{ - - makedev(major(0),minor(0)); - - ; - return 0; -} _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_device_macros=yes @@ -19666,14 +19586,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include #include #include - -int -main () -{ getaddrinfo(NULL, NULL, NULL, NULL); - ; - return 0; -} _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_getaddrinfo=yes @@ -20427,12 +20340,7 @@ $as_echo_n "checking gethostbyname_r with 6 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include - -int -main () -{ - + #include char *name; struct hostent *he, *res; char buffer[2048]; @@ -20441,9 +20349,6 @@ main () (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop) - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -20464,12 +20369,7 @@ $as_echo_n "checking gethostbyname_r with 5 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include - -int -main () -{ - + #include char *name; struct hostent *he; char buffer[2048]; @@ -20478,9 +20378,6 @@ main () (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop) - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -20501,21 +20398,13 @@ $as_echo_n "checking gethostbyname_r with 3 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include - -int -main () -{ - + #include char *name; struct hostent *he; struct hostent_data data; (void) gethostbyname_r(name, he, &data); - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -21723,18 +21612,11 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -int -main () -{ - FILE *f = fopen("/dev/null", "r"); flockfile(f); getc_unlocked(f); funlockfile(f); - ; - return 0; -} _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_have_getc_unlocked=yes diff --git a/configure.ac b/configure.ac index 734a4db8389915..3018cd411cff72 100644 --- a/configure.ac +++ b/configure.ac @@ -2781,7 +2781,7 @@ AS_VAR_IF([ac_cv_clock_t_time_h], [no], [ ]) AC_CACHE_CHECK([for makedev], [ac_cv_func_makedev], [ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +AC_LINK_IFELSE([AC_LANG_SOURCE([[ #if defined(MAJOR_IN_MKDEV) #include #elif defined(MAJOR_IN_SYSMACROS) @@ -2789,8 +2789,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #else #include #endif -]], [[ - makedev(0, 0) ]]) +makedev(0, 0) ]]) ],[ac_cv_func_makedev=yes],[ac_cv_func_makedev=no]) ]) @@ -2800,14 +2799,13 @@ AS_VAR_IF([ac_cv_func_makedev], [yes], [ # byte swapping AC_CACHE_CHECK([for le64toh], [ac_cv_func_le64toh], [ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +AC_LINK_IFELSE([AC_LANG_SOURCE([[ #ifdef HAVE_ENDIAN_H #include #elif defined(HAVE_SYS_ENDIAN_H) #include #endif -]], [[ - le64toh(1) ]]) +le64toh(1) ]]) ],[ac_cv_func_le64toh=yes],[ac_cv_func_le64toh=no]) ]) @@ -2926,8 +2924,9 @@ fi AC_CACHE_CHECK([for pthread_t], [ac_cv_have_pthread_t], [ AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[#include ]], [[pthread_t x; x = *(pthread_t*)0;]]) -], [ac_cv_have_pthread_t=yes], [ac_cv_have_pthread_t=no]) + AC_LANG_SOURCE([[#include + pthread_t x; x = *(pthread_t*)0; + ]])], [ac_cv_have_pthread_t=yes], [ac_cv_have_pthread_t=no]) ]) AS_VAR_IF([ac_cv_have_pthread_t], [yes], [ AC_CHECK_SIZEOF(pthread_t, [], [ @@ -2943,7 +2942,9 @@ AC_CHECK_SIZEOF(pthread_key_t, [], [[#include ]]) AC_CACHE_CHECK([whether pthread_key_t is compatible with int], [ac_cv_pthread_key_t_is_arithmetic_type], [ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [[pthread_key_t k; k * 1;]])], + [AC_LANG_SOURCE([[#include + pthread_key_t k; k * 1; + ]])], [ac_cv_pthread_key_t_is_arithmetic_type=yes], [ac_cv_pthread_key_t_is_arithmetic_type=no] ) @@ -3552,8 +3553,8 @@ AC_CHECK_LIB(intl, textdomain, case "$ac_sys_system" in AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support) AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[#include ]], - [[loadAndInit("", 0, "")]]) + AC_LANG_SOURCE([[#include + loadAndInit("", 0, "")]]) ],[ AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, [Define for AIX if your compiler is a genuine IBM xlC/xlC_r @@ -3950,7 +3951,7 @@ dnl hence CPPFLAGS instead of CFLAGS. have_sqlite3=yes AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([ + AC_LANG_SOURCE([ #include #if SQLITE_VERSION_NUMBER < 3007015 # error "SQLite 3.7.15 or higher required" @@ -4051,7 +4052,7 @@ WITH_SAVE_ENV([ LIBS="$TCLTK_LIBS $LDFLAGS" AC_LINK_IFELSE([ - AC_LANG_PROGRAM([ + AC_LANG_SOURCE([ #include #include #if defined(TK_HEX_VERSION) @@ -4069,7 +4070,6 @@ WITH_SAVE_ENV([ ((TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION == 5) && (TK_RELEASE_SERIAL < 12)) # error "Tk older than 8.5.12 not supported" #endif - ], [ void *x1 = Tcl_Init; void *x2 = Tk_Init; ]) @@ -4158,13 +4158,13 @@ AC_CHECK_HEADERS([db.h], [ AC_CACHE_CHECK([for libdb], [ac_cv_have_libdb], [ WITH_SAVE_ENV([ LIBS="$LIBS -ldb" - AC_LINK_IFELSE([AC_LANG_PROGRAM([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #define DB_DBM_HSEARCH 1 #include #if DB_VERSION_MAJOR < 5 #error "dh.h: DB_VERSION_MAJOR < 5 is not supported." #endif - ], [DBM *dbm = dbm_open(NULL, 0, 0)]) + DBM *dbm = dbm_open(NULL, 0, 0)]) ], [ac_cv_have_libdb=yes], [ac_cv_have_libdb=no]) ]) ]) @@ -4290,12 +4290,12 @@ yes _libs=$LIBS LIBS="$LIBS -lpthread" AC_MSG_CHECKING([for pthread_create in -lpthread]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + AC_LINK_IFELSE([AC_LANG_SOURCE([[ #include #include #include -void * start_routine (void *arg) { exit (0); }]], [[ +void * start_routine (void *arg) { exit (0); } pthread_create (NULL, NULL, start_routine, NULL)]])],[ AC_MSG_RESULT(yes) posix_threads=yes @@ -4410,10 +4410,11 @@ AC_ARG_ENABLE(ipv6, [ dnl the check does not work on cross compilation case... - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* AF_INET6 available check */ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */ #include -#include ]], -[[int domain = AF_INET6;]])],[ +#include +int domain = AF_INET6; +]])],[ ipv6=yes ],[ ipv6=no @@ -4428,10 +4429,11 @@ AC_MSG_RESULT([$ipv6]) if test "$ipv6" = "yes"; then AC_MSG_CHECKING(if RFC2553 API is available) AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[#include -#include ]], - [[struct sockaddr_in6 x; - x.sin6_scope_id;]]) + AC_LANG_SOURCE([[#include +#include +struct sockaddr_in6 x; +x.sin6_scope_id; + ]]) ],[ AC_MSG_RESULT(yes) ipv6=yes @@ -5152,7 +5154,7 @@ AC_CHECK_FUNCS(nanosleep, [], [ ]) AC_CACHE_CHECK([for major, minor, and makedev], [ac_cv_device_macros], [ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +AC_LINK_IFELSE([AC_LANG_SOURCE([[ #if defined(MAJOR_IN_MKDEV) #include #elif defined(MAJOR_IN_SYSMACROS) @@ -5160,8 +5162,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #else #include #endif -]], [[ - makedev(major(0),minor(0)); +makedev(major(0),minor(0)); ]])],[ac_cv_device_macros=yes], [ac_cv_device_macros=no]) ]) AS_VAR_IF([ac_cv_device_macros], [yes], [ @@ -5177,12 +5178,12 @@ AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1, # On OSF/1 V5.1, getaddrinfo is available, but a define # for [no]getaddrinfo in netdb.h. AC_CACHE_CHECK([for getaddrinfo], [ac_cv_func_getaddrinfo], [ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +AC_LINK_IFELSE([AC_LANG_SOURCE([[ #include #include #include #include -]], [[getaddrinfo(NULL, NULL, NULL, NULL);]])], +getaddrinfo(NULL, NULL, NULL, NULL);]])], [ac_cv_func_getaddrinfo=yes], [ac_cv_func_getaddrinfo=no]) ]) @@ -5413,9 +5414,8 @@ AC_CHECK_FUNC(gethostbyname_r, [ AC_MSG_CHECKING([gethostbyname_r with 6 args]) OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -# include - ]], [[ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include char *name; struct hostent *he, *res; char buffer[2048]; @@ -5431,9 +5431,8 @@ AC_CHECK_FUNC(gethostbyname_r, [ ],[ AC_MSG_RESULT(no) AC_MSG_CHECKING([gethostbyname_r with 5 args]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -# include - ]], [[ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include char *name; struct hostent *he; char buffer[2048]; @@ -5450,9 +5449,8 @@ AC_CHECK_FUNC(gethostbyname_r, [ ], [ AC_MSG_RESULT(no) AC_MSG_CHECKING([gethostbyname_r with 3 args]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -# include - ]], [[ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include char *name; struct hostent *he; struct hostent_data data; @@ -5937,7 +5935,7 @@ fi # check for getc_unlocked and related locking functions AC_CACHE_CHECK([for getc_unlocked() and friends], [ac_cv_have_getc_unlocked], [ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ +AC_LINK_IFELSE([AC_LANG_SOURCE([[#include FILE *f = fopen("/dev/null", "r"); flockfile(f); getc_unlocked(f);