From: Matthew Newton Date: Thu, 29 Sep 2022 15:50:11 +0000 (+0100) Subject: refresh configure.ac files suggested by autoupdate X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46448f770e17d0f0a762828c2edc34cdc68860ab;p=thirdparty%2Ffreeradius-server.git refresh configure.ac files suggested by autoupdate --- diff --git a/configure b/configure index e625020dbf3..a098b25291a 100755 --- a/configure +++ b/configure @@ -4358,7 +4358,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - if test $ac_cv_c_compiler_gnu = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 $as_echo_n "checking whether $CC needs -traditional... " >&6; } @@ -12760,40 +12759,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if ${ac_cv_type_signal+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - - if test "x$ac_cv_header_utmpx_h" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_xtime in struct utmpx" >&5 @@ -12998,8 +12963,6 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } $as_echo "#define HAVE_HTONLLL 1" >>confdefs.h @@ -14234,7 +14197,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15794,7 +15756,6 @@ $as_echo "#define GETHOSTBYADDRRSTYLE GNUSTYLE" >>confdefs.h gethostbyaddrrstyle=GNU - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15822,7 +15783,6 @@ $as_echo "#define GETHOSTBYADDRRSTYLE SYSVSTYLE" >>confdefs.h gethostbyaddrrstyle=SYSV - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15851,7 +15811,6 @@ $as_echo "#define GETHOSTBYADDRRSTYLE BSDSTYLE" >>confdefs.h gethostbyaddrrstyle=BSD - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15894,7 +15853,6 @@ $as_echo "#define GETHOSTBYNAMERSTYLE GNUSTYLE" >>confdefs.h gethostbynamerstyle=GNU - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15921,7 +15879,6 @@ $as_echo "#define GETHOSTBYNAMERSTYLE SYSVSTYLE" >>confdefs.h gethostbynamerstyle=SYSV - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15949,7 +15906,6 @@ $as_echo "#define GETHOSTBYNAMERSTYLE BSDSTYLE" >>confdefs.h gethostbynamerstyle=BSD - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15999,7 +15955,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16036,7 +15991,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16072,7 +16026,6 @@ $as_echo "#define CTIMERSTYLE SOLARISSTYLE" >>confdefs.h ctimerstyle="SOLARIS" - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16098,7 +16051,6 @@ $as_echo "#define CTIMERSTYLE POSIXSTYLE" >>confdefs.h ctimerstyle="POSIX" - fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext diff --git a/configure.ac b/configure.ac index c476a4df121..820d88bb6c0 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl # http://www.gnu.org/software/autoconf/ dnl # dnl # The recommended order is: dnl # -dnl # AC_INIT(file) +dnl # AC_INIT dnl # 0. checks for compiler, libtool, and command line options dnl # 1. checks for programs dnl # 2. checks for libraries @@ -16,14 +16,15 @@ dnl # 5. checks for structures and functions dnl # 6. checks for compiler characteristics dnl # 7. checks for library functions dnl # 8. checks for system services -dnl # AC_OUTPUT([file...]) +dnl # AC_CONFIG_FILES([file...]) +dnl # AC_OUTPUT dnl # dnl ############################################################# AC_PREREQ([2.69]) export CFLAGS LIBS LDFLAGS CPPFLAGS -AC_INIT([freeradius],[$]Id[$],[http://bugs.freeradius.org],,[http://www.freeradius.org]) +AC_INIT([freeradius],[$Id$],[http://bugs.freeradius.org],[],[http://www.freeradius.org]) AC_CONFIG_SRCDIR([src/bin/radiusd.c]) AC_CONFIG_HEADER([src/include/autoconf.h]) @@ -305,7 +306,7 @@ dnl # dnl # check for AIX, to allow us to use some BSD functions dnl # must be before macros that call the compiler. dnl # -AC_AIX +AC_USE_SYSTEM_EXTENSIONS AC_PROG_GCC_TRADITIONAL AC_PROG_CC_SUNPRO @@ -1786,8 +1787,6 @@ AC_CHECK_FUNCS( \ vsnprintf ) -AC_TYPE_SIGNAL - dnl # dnl # Check if we have utmpx.h dnl # if so, check if struct utmpx has entry ut_xtime @@ -1851,7 +1850,6 @@ AC_LINK_IFELSE( ]] )], [ - AC_MSG_RESULT(yes) AC_DEFINE(HAVE_HTONLLL, 1, [Define if the function (or macro) htonlll exists.]) ], [ @@ -2153,21 +2151,16 @@ FR_SMART_CHECK_INCLUDE(execinfo.h) if test "x$ac_cv_header_execinfo_h" = "xyes"; then dnl # Might be provided as part of libc AC_MSG_CHECKING([if execinfo provided as part of libc]) - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include - ], - [ + ]], [[ void *sym[1]; - backtrace_symbols(&sym, sizeof(sym)) ], - [ + backtrace_symbols(&sym, sizeof(sym)) ]])],[ AC_MSG_RESULT(yes) ac_cv_lib_execinfo_backtrace_symbols="yes" - ], - [ + ],[ AC_MSG_RESULT(no) - ] - ) + ]) if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then smart_try_dir=$execinfo_lib_dir FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) @@ -2356,46 +2349,34 @@ case "$target" in esac if test "x$gethostbyaddrrstyle" = "x"; then - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ], - [ gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL) ], - [ + ]], [[ gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL) ]])],[ AC_DEFINE(GETHOSTBYADDRRSTYLE, GNUSTYLE, [style of gethostbyaddr_r functions ]) gethostbyaddrrstyle=GNU - ] - ) + ],[]) fi if test "x$gethostbyaddrrstyle" = "x"; then - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ], - [ gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL) ] , - [ + ]], [[ gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL) ]])],[ AC_DEFINE(GETHOSTBYADDRRSTYLE, SYSVSTYLE, [style of gethostbyaddr_r functions ]) gethostbyaddrrstyle=SYSV - ] - ) + ],[]) fi if test "x$gethostbyaddrrstyle" = "x"; then - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ], - [ gethostbyaddr(NULL, 0, 0) ], - [ + ]], [[ gethostbyaddr(NULL, 0, 0) ]])],[ AC_DEFINE(GETHOSTBYADDRRSTYLE, BSDSTYLE, [style of gethostbyaddr_r functions ]) gethostbyaddrrstyle=BSD - ] - ) + ],[]) fi if test "x$gethostbyaddrrstyle" = "x"; then @@ -2419,44 +2400,32 @@ dnl # We need #stdio.h to define NULL on FreeBSD (at least) dnl # gethostbynamerstyle="" AC_MSG_CHECKING([gethostbyname_r() syntax]) -AC_TRY_LINK( - [ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ], - [ gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL) ], - [ + ]], [[ gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL) ]])],[ AC_DEFINE(GETHOSTBYNAMERSTYLE, GNUSTYLE, [style of gethostbyname_r functions ]) gethostbynamerstyle=GNU - ] -) +],[]) if test "x$gethostbynamerstyle" = "x"; then - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ], - [ gethostbyname_r(NULL, NULL, NULL, 0, NULL) ] , - [ + ]], [[ gethostbyname_r(NULL, NULL, NULL, 0, NULL) ]])],[ AC_DEFINE(GETHOSTBYNAMERSTYLE, SYSVSTYLE, [style of gethostbyname_r functions ]) gethostbynamerstyle=SYSV - ] - ) + ],[]) fi if test "x$gethostbynamerstyle" = "x"; then - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ], - [ gethostbyname(NULL) ], - [ + ]], [[ gethostbyname(NULL) ]])],[ AC_DEFINE(GETHOSTBYNAMERSTYLE, BSDSTYLE, [style of gethostbyname_r functions ]) gethostbynamerstyle=BSD - ] - ) + ],[]) fi if test "x$gethostbynamerstyle" = "x"; then @@ -2474,44 +2443,34 @@ dnl # Check for thread-safe getpwnam_r and getgrnam_r dnl # if test "x$ac_cv_header_pwd_h" = "xyes"; then AC_MSG_CHECKING([getpwnam_r]) - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include #include - ], - [ getpwnam_r(NULL, NULL, NULL, 0, NULL) ], - [ + ]], [[ getpwnam_r(NULL, NULL, NULL, 0, NULL) ]])],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_GETPWNAM_R, 1, [Define to 1 if you have the getpwnam_r.] ) - ], - [ + ],[ AC_MSG_RESULT(no) - ] - ) + ]) fi if test "x$ac_cv_header_grp_h" = "xyes"; then AC_MSG_CHECKING([getgrnam_r]) - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include #include - ], - [ getgrnam_r(NULL, NULL, NULL, 0, NULL) ], - [ + ]], [[ getgrnam_r(NULL, NULL, NULL, 0, NULL) ]])],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_GETGRNAM_R, 1, [Define to 1 if you have the getgrnam_r.] ) - ], - [ + ],[ AC_MSG_RESULT(no) - ] - ) + ]) fi @@ -2522,28 +2481,20 @@ AC_DEFINE(POSIXSTYLE, [1], [Posix-Style ctime_r]) AC_DEFINE(SOLARISSTYLE, [2], [Solaris-Style ctime_r]) ctimerstyle="" AC_MSG_CHECKING([ctime_r() syntax]) -AC_TRY_LINK( - [ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include - ], - [ ctime_r(NULL, NULL, 0) ], - [ + ]], [[ ctime_r(NULL, NULL, 0) ]])],[ AC_DEFINE(CTIMERSTYLE, SOLARISSTYLE, [style of ctime_r function]) ctimerstyle="SOLARIS" - ] -) +],[]) if test "x$ctimerstyle" = "x"; then - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include - ], - [ ctime_r(NULL, NULL) ], - [ + ]], [[ ctime_r(NULL, NULL) ]])],[ AC_DEFINE(CTIMERSTYLE, POSIXSTYLE, [style of ctime_r function]) ctimerstyle="POSIX" - ] - ) + ],[]) fi if test "x$ctimerstyle" = "x"; then @@ -2664,7 +2615,7 @@ dnl # AC_SUBST(LIBS) AC_SUBST(INSTALLSTRIP) -AC_OUTPUT(\ +AC_CONFIG_FILES([\ ./Make.inc \ ./src/include/build-radpaths-h \ ./src/bin/checkrad \ @@ -2676,4 +2627,5 @@ AC_OUTPUT(\ ./scripts/util/cryptpasswd \ ./raddb/radrelay.conf \ ./raddb/radiusd.conf -) +]) +AC_OUTPUT diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in index a5774418dd6..e4f9a9ba3e1 100644 --- a/src/include/autoconf.h.in +++ b/src/include/autoconf.h.in @@ -602,9 +602,6 @@ /* Raw version string from VERSION file */ #undef RADIUSD_VERSION_STRING -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define if the compiler supports size_t has the same underlying type as uint64 */ #undef SIZE_SAME_AS_UINT64 diff --git a/src/modules/rlm_cache/configure b/src/modules/rlm_cache/configure index f8dff310e66..0d96b9f6baf 100755 --- a/src/modules/rlm_cache/configure +++ b/src/modules/rlm_cache/configure @@ -1749,6 +1749,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_cache was given. if test "${with_rlm_cache+set}" = set; then : withval=$with_rlm_cache; diff --git a/src/modules/rlm_cache/configure.ac b/src/modules/rlm_cache/configure.ac index 2e8ef3d806b..3202fd9305a 100644 --- a/src/modules/rlm_cache/configure.ac +++ b/src/modules/rlm_cache/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_cache.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_cache.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_cache]) @@ -44,4 +45,5 @@ else fi AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure index d79f24b1178..a1b9672c86d 100755 --- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure +++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure @@ -1914,6 +1914,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_cache_memcached was given. if test "${with_rlm_cache_memcached+set}" = set; then : withval=$with_rlm_cache_memcached; diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac index 345d1b35943..fed1719edcb 100644 --- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac +++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_cache_memcached.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_cache_memcached.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_cache_memcached]) @@ -128,4 +129,5 @@ AC_SUBST(mod_cflags) AC_SUBST(mod_ldflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_couchbase/configure b/src/modules/rlm_couchbase/configure index d352a2c543d..9f82fcd149e 100755 --- a/src/modules/rlm_couchbase/configure +++ b/src/modules/rlm_couchbase/configure @@ -1846,6 +1846,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_couchbase was given. if test "${with_rlm_couchbase+set}" = set; then : withval=$with_rlm_couchbase; diff --git a/src/modules/rlm_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac index b7d996da1a3..d9f109c280d 100644 --- a/src/modules/rlm_couchbase/configure.ac +++ b/src/modules/rlm_couchbase/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_couchbase.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_couchbase.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_couchbase]) AC_CONFIG_HEADER(config.h) @@ -120,4 +121,5 @@ AC_SUBST(mod_cflags) AC_SUBST(mod_ldflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_eap/configure b/src/modules/rlm_eap/configure index 82428a90b2e..a91beddccfd 100755 --- a/src/modules/rlm_eap/configure +++ b/src/modules/rlm_eap/configure @@ -1752,6 +1752,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_eap was given. if test "${with_rlm_eap+set}" = set; then : withval=$with_rlm_eap; diff --git a/src/modules/rlm_eap/configure.ac b/src/modules/rlm_eap/configure.ac index c5991da093c..0b6b653c9b4 100644 --- a/src/modules/rlm_eap/configure.ac +++ b/src/modules/rlm_eap/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_eap.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_eap.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_eap]) @@ -66,4 +67,4 @@ AC_SUBST(eaptypes) AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT() +AC_OUTPUT diff --git a/src/modules/rlm_idn/configure b/src/modules/rlm_idn/configure index 5123cb57a78..02eb3d44a12 100755 --- a/src/modules/rlm_idn/configure +++ b/src/modules/rlm_idn/configure @@ -1835,6 +1835,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_idn was given. if test "${with_rlm_idn+set}" = set; then : withval=$with_rlm_idn; diff --git a/src/modules/rlm_idn/configure.ac b/src/modules/rlm_idn/configure.ac index 832cb0b7524..71d5193dc20 100644 --- a/src/modules/rlm_idn/configure.ac +++ b/src/modules/rlm_idn/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_idn.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_idn.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_idn]) @@ -38,5 +39,6 @@ mod_cflags="${SMART_CPPFLAGS}" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_krb5/configure b/src/modules/rlm_krb5/configure index 9f61a2b4479..a2e064daed5 100755 --- a/src/modules/rlm_krb5/configure +++ b/src/modules/rlm_krb5/configure @@ -1947,6 +1947,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_krb5 was given. if test "${with_rlm_krb5+set}" = set; then : withval=$with_rlm_krb5; diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac index 5509117107e..8bbadb690a9 100644 --- a/src/modules/rlm_krb5/configure.ac +++ b/src/modules/rlm_krb5/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_krb5.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_krb5.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_krb5]) @@ -182,4 +183,5 @@ mod_cflags="$krb5mod_cflags $krb5threadsafe $SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_lua/configure b/src/modules/rlm_lua/configure index b4aeb760e69..2b5d48c925c 100755 --- a/src/modules/rlm_lua/configure +++ b/src/modules/rlm_lua/configure @@ -2045,6 +2045,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_lua was given. if test "${with_rlm_lua+set}" = set; then : withval=$with_rlm_lua; diff --git a/src/modules/rlm_lua/configure.ac b/src/modules/rlm_lua/configure.ac index d3fd811a711..32f5f567309 100644 --- a/src/modules/rlm_lua/configure.ac +++ b/src/modules/rlm_lua/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_lua.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_lua.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_lua], [lua support]) @@ -131,5 +132,6 @@ AC_SUBST(lua_ldflags) AC_SUBST(targetname) # keep this! Don't change! AC_CONFIG_HEADER(config.h) -AC_OUTPUT([all.mk rlm_lua.mk libfreeradius-lua.mk]) # keep this! Don't change! +AC_CONFIG_FILES([all.mk rlm_lua.mk libfreeradius-lua.mk]) +AC_OUTPUT # keep this! Don't change! diff --git a/src/modules/rlm_mruby/configure b/src/modules/rlm_mruby/configure index 230d93cc561..331aadf31ed 100755 --- a/src/modules/rlm_mruby/configure +++ b/src/modules/rlm_mruby/configure @@ -1843,6 +1843,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_mruby was given. if test "${with_rlm_mruby+set}" = set; then : withval=$with_rlm_mruby; diff --git a/src/modules/rlm_mruby/configure.ac b/src/modules/rlm_mruby/configure.ac index a96a4921709..4802266c64d 100644 --- a/src/modules/rlm_mruby/configure.ac +++ b/src/modules/rlm_mruby/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_mruby.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_mruby.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_mruby]) @@ -123,4 +124,5 @@ AC_SUBST(mod_cflags) AC_SUBST(mod_ldflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_mschap/configure b/src/modules/rlm_mschap/configure index a4d56d6a946..91de326d1d4 100755 --- a/src/modules/rlm_mschap/configure +++ b/src/modules/rlm_mschap/configure @@ -1844,6 +1844,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_mschap was given. if test "${with_rlm_mschap+set}" = set; then : withval=$with_rlm_mschap; diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac index a15953e09f9..6b29418aef0 100644 --- a/src/modules/rlm_mschap/configure.ac +++ b/src/modules/rlm_mschap/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_mschap.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_mschap.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_mschap]) @@ -129,5 +130,6 @@ AC_SUBST(mod_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(rlm_mschap.mk) +AC_CONFIG_FILES([rlm_mschap.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_opendirectory/configure b/src/modules/rlm_opendirectory/configure index 9f8ebda5d04..2f980e491d5 100755 --- a/src/modules/rlm_opendirectory/configure +++ b/src/modules/rlm_opendirectory/configure @@ -1836,6 +1836,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_opendirectory was given. if test "${with_rlm_opendirectory+set}" = set; then : withval=$with_rlm_opendirectory; diff --git a/src/modules/rlm_opendirectory/configure.ac b/src/modules/rlm_opendirectory/configure.ac index 5ddb2f86fe3..c37767afd1c 100644 --- a/src/modules/rlm_opendirectory/configure.ac +++ b/src/modules/rlm_opendirectory/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_opendirectory.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_opendirectory.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_opendirectory]) @@ -39,5 +40,6 @@ fi AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_pam/configure b/src/modules/rlm_pam/configure index 70b2414193d..40dfc53b6ec 100755 --- a/src/modules/rlm_pam/configure +++ b/src/modules/rlm_pam/configure @@ -2034,6 +2034,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_pam was given. if test "${with_rlm_pam+set}" = set; then : withval=$with_rlm_pam; diff --git a/src/modules/rlm_pam/configure.ac b/src/modules/rlm_pam/configure.ac index 7eb7c428db9..bb44022f791 100644 --- a/src/modules/rlm_pam/configure.ac +++ b/src/modules/rlm_pam/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_pam.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_pam.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_pam]) AC_DEFUN([modname_useropt],[m4_bpatsubst([]modname,[[-+.]],[_])]) @@ -49,4 +50,5 @@ AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_perl/configure b/src/modules/rlm_perl/configure index 061a3689085..daf4e3e9cc4 100755 --- a/src/modules/rlm_perl/configure +++ b/src/modules/rlm_perl/configure @@ -1840,6 +1840,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_perl was given. if test "${with_rlm_perl+set}" = set; then : withval=$with_rlm_perl; diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac index aee72cc2bda..cbf2b121e1e 100644 --- a/src/modules/rlm_perl/configure.ac +++ b/src/modules/rlm_perl/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_perl.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_perl.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_perl]) @@ -78,12 +79,10 @@ if test x$with_[]modname != xno; then dnl # Link test functions dnl ############################################################ AC_MSG_CHECKING([we can link to boot_DynaLoader]) - AC_TRY_LINK([], - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern char boot_DynaLoader(); boot_DynaLoader(); - ], - [LINKS="yes"], [LINKS="no"]) + ]])],[LINKS="yes"],[LINKS="no"]) AC_MSG_RESULT($LINKS) if test "x$LINKS" = "xno"; then @@ -92,12 +91,10 @@ if test x$with_[]modname != xno; then fi AC_MSG_CHECKING([we can link to Perl_hv_store()]) - AC_TRY_LINK([], - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern char Perl_hv_store(); Perl_hv_store(); - ], - [LINKS="yes"], [LINKS="no"]) + ]])],[LINKS="yes"],[LINKS="no"]) AC_MSG_RESULT($LINKS) if test "x$LINKS" = "xno"; then @@ -134,4 +131,5 @@ AC_SUBST(mod_ldflags) AC_CONFIG_HEADER(config.h) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_radutmp/configure b/src/modules/rlm_radutmp/configure index 3734e9be846..3f41e047449 100755 --- a/src/modules/rlm_radutmp/configure +++ b/src/modules/rlm_radutmp/configure @@ -1988,6 +1988,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_radutmp was given. if test "${with_rlm_radutmp+set}" = set; then : withval=$with_rlm_radutmp; diff --git a/src/modules/rlm_radutmp/configure.ac b/src/modules/rlm_radutmp/configure.ac index f07d908c679..2133e5eaffd 100644 --- a/src/modules/rlm_radutmp/configure.ac +++ b/src/modules/rlm_radutmp/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_radutmp.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_radutmp.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_radutmp]) @@ -17,4 +18,5 @@ AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sigtran/configure b/src/modules/rlm_sigtran/configure index ca8de75bc39..d3d001e51e5 100755 --- a/src/modules/rlm_sigtran/configure +++ b/src/modules/rlm_sigtran/configure @@ -1801,6 +1801,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sigtran was given. if test "${with_rlm_sigtran+set}" = set; then : withval=$with_rlm_sigtran; diff --git a/src/modules/rlm_sigtran/configure.ac b/src/modules/rlm_sigtran/configure.ac index de5b6c9624c..5e12ae1fe38 100644 --- a/src/modules/rlm_sigtran/configure.ac +++ b/src/modules/rlm_sigtran/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sigtran.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sigtran.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sigtran]) @@ -128,5 +129,6 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/configure b/src/modules/rlm_sql/configure index a401bfa1cb1..e26f6c603b9 100755 --- a/src/modules/rlm_sql/configure +++ b/src/modules/rlm_sql/configure @@ -1751,6 +1751,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql was given. if test "${with_rlm_sql+set}" = set; then : withval=$with_rlm_sql; diff --git a/src/modules/rlm_sql/configure.ac b/src/modules/rlm_sql/configure.ac index 4ad3e747918..c696ae392e9 100644 --- a/src/modules/rlm_sql/configure.ac +++ b/src/modules/rlm_sql/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql]) @@ -65,4 +66,5 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure index 6c1e9200a77..eff86651b2a 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure @@ -1805,6 +1805,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_cassandra was given. if test "${with_rlm_sql_cassandra+set}" = set; then : withval=$with_rlm_sql_cassandra; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac index 26578ce15f5..f0cb397d668 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_cassandra.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_cassandra.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_cassandra]) @@ -118,4 +119,5 @@ AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure index 9593e9aca24..c558218ed68 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure @@ -1803,6 +1803,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_db2 was given. if test "${with_rlm_sql_db2+set}" = set; then : withval=$with_rlm_sql_db2; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac index e4589dd4fec..92a53c13773 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_db2.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_db2.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_db2]) @@ -93,4 +94,5 @@ sql_ibmdb2_cflags="$SMART_CPPFLAGS" AC_SUBST(sql_ibmdb2_ldflags) AC_SUBST(sql_ibmdb2_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure index 2f1a9049f29..bffc92793c7 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure @@ -1804,6 +1804,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_firebird was given. if test "${with_rlm_sql_firebird+set}" = set; then : withval=$with_rlm_sql_firebird; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac index bdd8eec910b..bebb8475b60 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_firebird.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_firebird.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_firebird]) @@ -92,4 +93,5 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure index e1cb186206f..b56b4677941 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure @@ -1804,6 +1804,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_freetds was given. if test "${with_rlm_sql_freetds+set}" = set; then : withval=$with_rlm_sql_freetds; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac index 199db705cf3..38d5a6ac2f1 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_freetds.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_freetds.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_freetds]) @@ -107,4 +108,5 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure index a46b8394df5..a0bd76c3699 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure @@ -1806,6 +1806,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_mysql was given. if test "${with_rlm_sql_mysql+set}" = set; then : withval=$with_rlm_sql_mysql; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac index 075751c74bf..d99b75ac7db 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_mysql.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_mysql.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_mysql]) AC_CONFIG_HEADER(config.h) @@ -166,7 +167,7 @@ if test x$with_[]modname != xno; then old_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $mod_cflags" AC_MSG_CHECKING([for mysql.h (using mysql_config --cflags)]) - AC_TRY_COMPILE([#include ], [int a = 1;], have_mysql_h=yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[int a = 1;]])],[have_mysql_h=yes],[]) if test "x$have_mysql_h" = "xyes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MYSQL_H, [], [Define if you have ]) @@ -177,7 +178,7 @@ if test x$with_[]modname != xno; then mod_cflags="$(mysql_config --include)" CFLAGS="$old_CFLAGS $mod_cflags" AC_MSG_CHECKING([for mysql.h (using mysql_config --include)]) - AC_TRY_COMPILE([#include ], [int a = 1;], have_mysql_h=yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[int a = 1;]])],[have_mysql_h=yes],[]) if test "x$have_mysql_h" = "xyes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MYSQL_H, [], [Define if you have ]) @@ -222,4 +223,5 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure index 1fb3b49274c..fdc84d93a3a 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure @@ -1804,6 +1804,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_oracle was given. if test "${with_rlm_sql_oracle+set}" = set; then : withval=$with_rlm_sql_oracle; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac index bbbeab23973..5fe9693c0ca 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_sql_oracle.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_oracle.c]) AC_REVISION($Revision: 1.10 $) FR_INIT_MODULE([rlm_sql_oracle]) @@ -102,7 +103,7 @@ if test x$with_[]modname != xno; then LIBS="$old_LIBS -L$path -Wl,-rpath,$path -lclntsh -lnnz${oracle_version}" - AC_TRY_LINK([#include + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include static OCIEnv *p_env; static OCIError *p_err; @@ -110,8 +111,7 @@ if test x$with_[]modname != xno; then static OCIStmt *p_sql; static OCIDefine *p_dfn = (OCIDefine *) 0; static OCIBind *p_bnd = (OCIBind *) 0; - ], - [ + ]], [[ int p_bvi; char p_sli[20]; int rc; @@ -123,9 +123,7 @@ if test x$with_[]modname != xno; then (dvoid * (*)(dvoid *, dvoid *, size_t))0, (void (*)(dvoid *, dvoid *)) 0 ); - ], - [mod_ldflags="$LIBS"], - ) + ]])],[mod_ldflags="$LIBS"],[]) if test "x$mod_ldflags" != "x"; then AC_MSG_RESULT(yes) break @@ -166,4 +164,5 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure index 699a1536575..8c745dde184 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure @@ -1867,6 +1867,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_postgresql was given. if test "${with_rlm_sql_postgresql+set}" = set; then : withval=$with_rlm_sql_postgresql; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac index 1b840e0484b..f6e3d563bba 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_sql_postgresql.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_postgresql.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_postgresql]) @@ -128,4 +129,5 @@ AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure index 4ce0fc031ea..c7c9261e6bc 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure @@ -1925,6 +1925,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_sqlite was given. if test "${with_rlm_sql_sqlite+set}" = set; then : withval=$with_rlm_sql_sqlite; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac index 734fa5bea8b..c7389482fb6 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_sqlite.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_sqlite.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_sqlite]) @@ -129,4 +130,5 @@ AC_SUBST(mod_cflags) AC_CONFIG_HEADER(config.h) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure index 55eb324f0f8..51b0d34f4d4 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure @@ -1804,6 +1804,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_sql_unixodbc was given. if test "${with_rlm_sql_unixodbc+set}" = set; then : withval=$with_rlm_sql_unixodbc; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac index d2f901f68bc..98de9754001 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_sql_unixodbc.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_sql_unixodbc.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_sql_unixodbc]) @@ -93,4 +94,5 @@ mod_cflags="$SMART_CPPFLAGS" AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_unbound/configure b/src/modules/rlm_unbound/configure index a2de42cf625..fb260b13f1b 100755 --- a/src/modules/rlm_unbound/configure +++ b/src/modules/rlm_unbound/configure @@ -1799,6 +1799,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_unbound was given. if test "${with_rlm_unbound+set}" = set; then : withval=$with_rlm_unbound; diff --git a/src/modules/rlm_unbound/configure.ac b/src/modules/rlm_unbound/configure.ac index 5361f83b929..3bfa21065ac 100644 --- a/src/modules/rlm_unbound/configure.ac +++ b/src/modules/rlm_unbound/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_unbound.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_unbound.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_unbound]) @@ -79,4 +80,5 @@ AC_SUBST(mod_ldflags) AC_CONFIG_HEADER(config.h) AC_SUBST(targetname) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_unix/configure b/src/modules/rlm_unix/configure index ae9b7d6608f..0c8eb1e2240 100755 --- a/src/modules/rlm_unix/configure +++ b/src/modules/rlm_unix/configure @@ -2101,6 +2101,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_unix was given. if test "${with_rlm_unix+set}" = set; then : withval=$with_rlm_unix; diff --git a/src/modules/rlm_unix/configure.ac b/src/modules/rlm_unix/configure.ac index aac13f1606d..884e82319e6 100644 --- a/src/modules/rlm_unix/configure.ac +++ b/src/modules/rlm_unix/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_unix.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_unix.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_unix]) @@ -65,4 +66,5 @@ AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_winbind/configure b/src/modules/rlm_winbind/configure index fab26726b5c..0edeac3882e 100755 --- a/src/modules/rlm_winbind/configure +++ b/src/modules/rlm_winbind/configure @@ -1843,6 +1843,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_winbind was given. if test "${with_rlm_winbind+set}" = set; then : withval=$with_rlm_winbind; diff --git a/src/modules/rlm_winbind/configure.ac b/src/modules/rlm_winbind/configure.ac index 056747b430b..acbcd421583 100644 --- a/src/modules/rlm_winbind/configure.ac +++ b/src/modules/rlm_winbind/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(rlm_winbind.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_winbind.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_winbind]) @@ -120,5 +121,6 @@ AC_SUBST(mod_ldflags) AC_SUBST(mod_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT diff --git a/src/modules/rlm_yubikey/configure b/src/modules/rlm_yubikey/configure index cff5b38bfea..3ffef193b9f 100755 --- a/src/modules/rlm_yubikey/configure +++ b/src/modules/rlm_yubikey/configure @@ -1811,6 +1811,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Check whether --with-rlm_yubikey was given. if test "${with_rlm_yubikey+set}" = set; then : withval=$with_rlm_yubikey; diff --git a/src/modules/rlm_yubikey/configure.ac b/src/modules/rlm_yubikey/configure.ac index 71f695f94f8..fac92f8bade 100644 --- a/src/modules/rlm_yubikey/configure.ac +++ b/src/modules/rlm_yubikey/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT(rlm_yubikey.c) +AC_INIT +AC_CONFIG_SRCDIR([rlm_yubikey.c]) AC_REVISION($Revision$) FR_INIT_MODULE([rlm_yubikey]) @@ -200,4 +201,5 @@ AC_SUBST(mod_cflags) AC_SUBST(mod_ldflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(all.mk) +AC_CONFIG_FILES([all.mk]) +AC_OUTPUT