run autoupdate on configure.ac

diff --git a/configure.ac b/configure.ac
index d978e881fff21c7e21d6927ad55d6d84fcf67f30..cb3eeb62bc4e82834720f875b8da4d637fc7f79e 100644 (file)
--- 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,14 @@ 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_OUTPUT
 dnl #
 dnl #############################################################
 
-AC_PREREQ([2.68])
+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_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/main/radiusd.c])
 AC_CONFIG_HEADER([src/include/autoconf.h])
@@ -195,7 +195,7 @@ dnl #############################################################
 dnl #
 dnl #  Get system information
 dnl #
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
 dnl #
 dnl #  clang etc. on OSX no longer searches the default paths for things,
@@ -220,7 +220,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
@@ -1806,8 +1806,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
@@ -2145,21 +2143,16 @@ if test "x$ac_cv_header_execinfo_h" = "xyes"; then
   if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "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 <execinfo.h>
-      ],
-      [
+      ]], [[
         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)
-      ]
-    )
+    ])
   fi
 
   if test "x$ac_cv_lib_execinfo_backtrace_symbols" = "xyes"; then
@@ -2354,46 +2347,34 @@ case "$host" in
 esac
 
 if test "x$gethostbyaddrrstyle" = "x"; then
-  AC_TRY_LINK(
-    [
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
       #include <stdio.h>
       #include <netdb.h>
-    ],
-    [ 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 <stdio.h>
       #include <netdb.h>
-    ],
-    [ 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 <stdio.h>
       #include <netdb.h>
-    ],
-    [ 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
@@ -2417,44 +2398,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 <stdio.h>
     #include <netdb.h>
-  ],
-  [ 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 <stdio.h>
       #include <netdb.h>
-    ],
-    [ 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 <stdio.h>
       #include <netdb.h>
-    ],
-    [ gethostbyname(NULL) ],
-    [
+    ]], [[ gethostbyname(NULL) ]])],[
       AC_DEFINE(GETHOSTBYNAMERSTYLE, BSDSTYLE, [style of gethostbyname_r functions ])
       gethostbynamerstyle=BSD
-    ]
-  )
+  ],[])
 fi
 
 if test "x$gethostbynamerstyle" = "x"; then
@@ -2472,44 +2441,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 <stdlib.h>
       #include <sys/types.h>
       #include <pwd.h>
-    ],
-    [ 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 <stdlib.h>
       #include <sys/types.h>
       #include <grp.h>
-    ],
-    [ 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
 
 
@@ -2520,28 +2479,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 <time.h>
-  ],
-  [ 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 <time.h>
-    ],
-    [ 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
@@ -2657,7 +2608,7 @@ USE_STATIC_LIBS="yes"
 AC_SUBST(USE_STATIC_LIBS)
 AC_SUBST(STATIC_MODULES)
 
-AC_OUTPUT(\
+AC_CONFIG_FILES([\
   ./Make.inc \
   ./src/include/build-radpaths-h \
   ./src/main/radsniff.mk \
@@ -2670,4 +2621,5 @@ AC_OUTPUT(\
   ./scripts/cryptpasswd \
   ./raddb/radrelay.conf \
   ./raddb/radiusd.conf
-)
+])
+AC_OUTPUT

diff --git a/src/modules/rlm_cache/configure.ac b/src/modules/rlm_cache/configure.ac
index d146f4a2393b212128bd83af4d4ecd107ba9dd09..3202fd9305a4102351bf59af93f637f57841b3a6 100644 (file)
--- a/src/modules/rlm_cache/configure.ac
+++ b/src/modules/rlm_cache/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_cache.c)
+AC_PREREQ([2.69])
+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.ac b/src/modules/rlm_cache/drivers/rlm_cache_memcached/configure.ac
index cd92f35e46a0569274e7d31fc5a4615869ee9d1e..fed1719edcb65cde732a4434b8e5495b4c555ff2 100644 (file)
--- 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.68])
-AC_INIT(rlm_cache_memcached.c)
+AC_PREREQ([2.69])
+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_cache/drivers/rlm_cache_redis/configure.ac b/src/modules/rlm_cache/drivers/rlm_cache_redis/configure.ac
index 1980f4dcf1aa9bfd77543274fb77dc0c879c2c6a..334a2672636718dca3f12cfb72e86748111eea01 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/configure.ac
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_cache_redis.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_cache_redis.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_cache_redis])
 
@@ -112,4 +113,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_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac
index ce39f3494bc88512179dd06482f9cd1e3bdb7505..959966fb4ed0ae5f779dafb6d33b2c11558e3349 100644 (file)
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_couchbase.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_couchbase.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_couchbase])
 AC_CONFIG_HEADER(config.h)
@@ -239,4 +240,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_counter/configure.ac b/src/modules/rlm_counter/configure.ac
index d547946d35ce57577ad5a4bbd0d57e4e9d3ff05b..773a2957526c6c273e478c2bd2470c03a3e2624b 100644 (file)
--- a/src/modules/rlm_counter/configure.ac
+++ b/src/modules/rlm_counter/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_counter.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_counter.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_counter])
 
@@ -64,4 +65,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_eap/configure.ac b/src/modules/rlm_eap/configure.ac
index b1c0cfbc4a98fcb645ee0f37f0ca2cd443f5d91c..0b6b653c9b4583ef61a9c16358f619652923da8b 100644 (file)
--- a/src/modules/rlm_eap/configure.ac
+++ b/src/modules/rlm_eap/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_eap.c)
+AC_PREREQ([2.69])
+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_eap/types/rlm_eap_fast/configure.ac b/src/modules/rlm_eap/types/rlm_eap_fast/configure.ac
index b8728821d19b4c065704ac402c27b8bae22fbc2e..71bc2bca713a5a8bc710909fdef73d98c9d5d36b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_fast/configure.ac
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_eap_fast.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_eap_fast.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_eap_fast])
 
@@ -95,4 +96,5 @@ 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_eap/types/rlm_eap_ikev2/configure.ac b/src/modules/rlm_eap/types/rlm_eap_ikev2/configure.ac
index b922204043f5a38560d215b0a41a3b806ef965ba..747204b36b8e34a7dc71c3a9bc31ad19f043704c 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ikev2/configure.ac
+++ b/src/modules/rlm_eap/types/rlm_eap_ikev2/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_eap_ikev2.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_eap_ikev2.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_eap_ikev2])
 
@@ -108,4 +109,5 @@ AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
 AC_SUBST(targetname)  # keep this!  Don't change!
-AC_OUTPUT(all.mk)  # keep this!  Don't change!
+AC_CONFIG_FILES([all.mk])
+AC_OUTPUT  # keep this!  Don't change!

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/configure.ac b/src/modules/rlm_eap/types/rlm_eap_pwd/configure.ac
index 64e5919301ddf9e14d26358287ae5b72e9fccb3d..1058faba5fd6fb7e9c5e33033fb4c9d3b4ba31ed 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/configure.ac
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_eap_pwd.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_eap_pwd.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_eap_pwd])
 
@@ -88,4 +89,5 @@ 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_eap/types/rlm_eap_sim/configure.ac b/src/modules/rlm_eap/types/rlm_eap_sim/configure.ac
index dceab359a1facbd5aadda2c3b58b5f81dfe351b1..58d429bfbd30e0b4c9c781994d91272ca432abdc 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_sim/configure.ac
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_eap_sim.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_eap_sim.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_eap_sim])
 
@@ -34,4 +35,5 @@ 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_eap/types/rlm_eap_tnc/configure.ac b/src/modules/rlm_eap/types/rlm_eap_tnc/configure.ac
index e5095eb2438da88bc052b5b6bd0575c1e40676ad..f2536079289ff54b2d13cde09b5159efa3831560 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tnc/configure.ac
+++ b/src/modules/rlm_eap/types/rlm_eap_tnc/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_eap_tnc.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_eap_tnc.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_eap_tnc])
 
@@ -96,4 +97,5 @@ AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 
 AC_SUBST(targetname)  # keep this!  Don't change!
-AC_OUTPUT(all.mk)  # keep this!  Don't change!
+AC_CONFIG_FILES([all.mk])
+AC_OUTPUT  # keep this!  Don't change!

diff --git a/src/modules/rlm_example/configure.ac b/src/modules/rlm_example/configure.ac
index 67daed9723b12b673b587816d32a78072065e47a..fb1db4cf65ceb236675b25031db1ad4d11f127ef 100644 (file)
--- a/src/modules/rlm_example/configure.ac
+++ b/src/modules/rlm_example/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_example.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_example.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_example])
 
@@ -44,4 +45,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_idn/configure.ac b/src/modules/rlm_idn/configure.ac
index 1e679b2e311da0fa9862c52b86ec64d2cfc164e2..066f34c339142c38fd4a64d0d44fecb59167b4de 100644 (file)
--- a/src/modules/rlm_idn/configure.ac
+++ b/src/modules/rlm_idn/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_idn.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_idn.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_idn])
 
@@ -39,5 +40,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_ippool/configure.ac b/src/modules/rlm_ippool/configure.ac
index 68f5f9ddfb2ed6c444bbc925a1598d88cb9fbc51..ac54844db3b2341fcbed0a9da31b271662a36bf3 100644 (file)
--- a/src/modules/rlm_ippool/configure.ac
+++ b/src/modules/rlm_ippool/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_ippool.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_ippool.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_ippool])
 
@@ -70,4 +71,5 @@ AC_SUBST(targetname)
 AC_SUBST(ippool_utils)
 AC_SUBST(ippool_install)
 AC_CONFIG_HEADER(config.h)
-AC_OUTPUT(all.mk)
+AC_CONFIG_FILES([all.mk])
+AC_OUTPUT

diff --git a/src/modules/rlm_json/configure.ac b/src/modules/rlm_json/configure.ac
index 8aec7643b11867f17cf9402b23164c4e2c8f1536..46b8302d6d6ff7885b3bd9d1bfea400777a2c51c 100644 (file)
--- a/src/modules/rlm_json/configure.ac
+++ b/src/modules/rlm_json/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_json.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_json.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_json], [JSON support from json-c])
 AC_CONFIG_HEADER(config.h)
@@ -148,4 +149,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_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
index 2f718bb44a53e78d7237b24239db6857bbc45c22..5c99fa532c774588c03da55bcb8ff647927df267 100644 (file)
--- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_krb5.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_krb5.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_krb5], [Kerberos support])
 
@@ -181,4 +182,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_ldap/configure.ac b/src/modules/rlm_ldap/configure.ac
index 4ba485e2cac32ba12cd20ecbba1d80c36526c77b..36895b491b944ca2bb96f982f727926900489406 100644 (file)
--- a/src/modules/rlm_ldap/configure.ac
+++ b/src/modules/rlm_ldap/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_ldap.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_ldap.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_ldap], [LDAP support])
 
@@ -102,11 +103,9 @@ if test x$with_[]modname != xno; then
                        ldap_url_desc2str
                )
                AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, ac_cv_ldap_set_rebind_proc, [
-                       AC_TRY_COMPILE([
+                       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
                                #include <lber.h>
-                               #include <ldap.h>], [ldap_set_rebind_proc(0, 0, 0);],
-                               [ac_cv_ldap_set_rebind_proc=3],
-                               [ac_cv_ldap_set_rebind_proc=2])
+                               #include <ldap.h>]], [[ldap_set_rebind_proc(0, 0, 0);]])],[ac_cv_ldap_set_rebind_proc=3],[ac_cv_ldap_set_rebind_proc=2])
                ])
        fi
 
@@ -154,4 +153,5 @@ AC_SUBST(mod_cflags)
 AC_SUBST(SASL)
 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_opendirectory/configure.ac b/src/modules/rlm_opendirectory/configure.ac
index f28253041bcc4b380297072ee6798a97d564dd24..211e5fb60c92cce63557e39425f7d20b22106541 100644 (file)
--- 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], [OpenDirectory support])
 
@@ -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.ac b/src/modules/rlm_pam/configure.ac
index e2ba1ce4f9d563852fc16e0c9a2529ce6ccdbc55..75b2b141439aeee95eda37a12f12f5468ffee19a 100644 (file)
--- a/src/modules/rlm_pam/configure.ac
+++ b/src/modules/rlm_pam/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_pam.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_pam.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_pam], [support for PAM authentication])
 
@@ -59,4 +60,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.ac b/src/modules/rlm_perl/configure.ac
index 4f87ae784bee4df750d09962af2f35452b9613f2..1aa2b689e6e0bec725bdf90e4c1f0318e10fe265 100644 (file)
--- a/src/modules/rlm_perl/configure.ac
+++ b/src/modules/rlm_perl/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_perl.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_perl.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_perl], [support for embedded Perl functions])
 
@@ -66,12 +67,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
@@ -80,12 +79,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
@@ -122,4 +119,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_python/configure.ac b/src/modules/rlm_python/configure.ac
index 5129b951dac354f003d1e55a636fd92c72ff7f20..057611465529220b2d50d401fcbf7ee2df327e73 100644 (file)
--- a/src/modules/rlm_python/configure.ac
+++ b/src/modules/rlm_python/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_python.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_python.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_python], [support for embedded Python2])
 
@@ -156,4 +157,5 @@ AC_CONFIG_HEADER(config.h)
 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_python3/configure.ac b/src/modules/rlm_python3/configure.ac
index 208580d55e8a671d402ff4e426eafa88b5356746..8d4d9332dee81c2f09a2d13d9a2edca7cf91d983 100644 (file)
--- a/src/modules/rlm_python3/configure.ac
+++ b/src/modules/rlm_python3/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT([rlm_python3.c])
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_python3.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_python3], [support for embedded Python3])
 
@@ -110,4 +111,5 @@ AC_CONFIG_HEADER(config.h)
 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_radutmp/configure.ac b/src/modules/rlm_radutmp/configure.ac
index 9eda4779c84ed91d1a7d2c361d81004a4b0c0356..6a7f4fe2543aa68b1a1032f8822fd281e5f077ad 100644 (file)
--- a/src/modules/rlm_radutmp/configure.ac
+++ b/src/modules/rlm_radutmp/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_radutmp.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_radutmp.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_radutmp], [radutmp support])
 
@@ -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_realm/configure.ac b/src/modules/rlm_realm/configure.ac
index 7070e46b478aa9f24f513201f4ae537572500f63..8178311001060608b69426af540bc1e429473747 100644 (file)
--- a/src/modules/rlm_realm/configure.ac
+++ b/src/modules/rlm_realm/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_realm.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_realm.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_realm])
 
@@ -45,4 +46,5 @@ AC_SUBST(mod_ldflags)
 AC_SUBST(trustrouter)
 
 AC_SUBST(targetname)
-AC_OUTPUT(all.mk)
+AC_CONFIG_FILES([all.mk])
+AC_OUTPUT

diff --git a/src/modules/rlm_redis/configure.ac b/src/modules/rlm_redis/configure.ac
index e4051a6c1c7bf4bebf3efeb4771df69d0b62f304..26f0296a6a53eaf23048fdb418a128946a90866a 100644 (file)
--- a/src/modules/rlm_redis/configure.ac
+++ b/src/modules/rlm_redis/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.61])
-AC_INIT(rlm_redis.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_redis.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_redis], [Redis database support])
 
@@ -112,4 +113,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_rediswho/configure.ac b/src/modules/rlm_rediswho/configure.ac
index 243b3f879aa3d705bd6248c6c83ff2eb9d0d5908..90f13dc5bc2dfd6b7ed7ecedfb28f38d58e8242f 100644 (file)
--- a/src/modules/rlm_rediswho/configure.ac
+++ b/src/modules/rlm_rediswho/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.61])
-AC_INIT(rlm_rediswho.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_rediswho.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_rediswho])
 
@@ -112,4 +113,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_rest/configure.ac b/src/modules/rlm_rest/configure.ac
index fde100e9538f1c5422a917bb2aa90fa73451a5ab..3a0a780af324a7da22e926cf98349d7b2ed2a37a 100644 (file)
--- a/src/modules/rlm_rest/configure.ac
+++ b/src/modules/rlm_rest/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_rest.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_rest.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_rest])
 AC_CONFIG_HEADER(config.h)
@@ -169,5 +170,6 @@ 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_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac
index 24acc23cd8c1df125c7bea08002e1825f376d99c..b32c6d0e23172cd7dbaf0694930b9fd418bbff0e 100644 (file)
--- a/src/modules/rlm_ruby/configure.ac
+++ b/src/modules/rlm_ruby/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_ruby.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_ruby.c])
 AC_REVISION($Revision: 1.9 $)
 FR_INIT_MODULE([rlm_ruby], [support for embedded Ruby functions])
 
@@ -51,4 +52,5 @@ AC_SUBST(mod_ldflags)
 AC_SUBST(mod_cflags)
 AC_SUBST(ruby_headers)
 AC_SUBST(targetname)
-AC_OUTPUT(all.mk)
+AC_CONFIG_FILES([all.mk])
+AC_OUTPUT

diff --git a/src/modules/rlm_securid/configure.ac b/src/modules/rlm_securid/configure.ac
index 979951d0d27b0b216ef367302949344cfc9bd53c..e697eeaa774f3a29743b9ebde35b588fadab4968 100644 (file)
--- a/src/modules/rlm_securid/configure.ac
+++ b/src/modules/rlm_securid/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.59])
-AC_INIT(rlm_securid.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_securid.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_securid])
 
@@ -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_smsotp/configure.ac b/src/modules/rlm_smsotp/configure.ac
index ba0a3a283078328933fdfd31abdae741faf69f14..58bfbc3d4630a6dcaf203616586f344913ebbe1e 100644 (file)
--- a/src/modules/rlm_smsotp/configure.ac
+++ b/src/modules/rlm_smsotp/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_smsotp.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_smsotp.c])
 AC_REVISION($Revision: 0.1 $)
 FR_INIT_MODULE([rlm_smsotp])
 
@@ -37,4 +38,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_sql/configure.ac b/src/modules/rlm_sql/configure.ac
index c8932cdbef754e8ec346e66fd844581389644cfa..c8aa74afbe7531b9867c74e14dfe3c88cd2b74b9 100644 (file)
--- a/src/modules/rlm_sql/configure.ac
+++ b/src/modules/rlm_sql/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_sql.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sql], [support for SQL databases])
 
@@ -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_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
index d8e85a941a9b527724c99f246fcc7c7c6b79c946..92a53c1377348dbc566656c9bbbcee6fec6b1813 100644 (file)
--- 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.59])
-AC_INIT(rlm_sql_db2.c)
+AC_PREREQ([2.69])
+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.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac
index 8a0aee5f33ebc25af84cd027c25e50cdd1e38d9c..bebb8475b60247d56a8ef8c814622d3494e9814d 100644 (file)
--- 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.59])
-AC_INIT(rlm_sql_firebird.c)
+AC_PREREQ([2.69])
+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.ac b/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.ac
index 7586984d1bb1acd34339f49189c694fdc00c2273..38d5a6ac2f14b9569b0c477fed0ab99141bd71bd 100644 (file)
--- 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.59])
-AC_INIT(rlm_sql_freetds.c)
+AC_PREREQ([2.69])
+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_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac
index a5166c697529f408fb965450c882bc98be8028a3..4e06b650b18215dcc771a9f0c40e6c7cb2e04f26 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.59])
-AC_INIT(rlm_sql_iodbc.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql_iodbc.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sql_iodbc])
 
@@ -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_sql/drivers/rlm_sql_mongo/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mongo/configure.ac
index 5d64d5f7d619d598e78e09a5568321d8ad97c60d..f9644d72c4216d48aed66697704eb9813b2692e0 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mongo/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mongo/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_sql_mongo.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql_mongo.c])
 AC_REVISION($Revision: 1.10 $)
 FR_INIT_MODULE([rlm_sql_mongo])
 
@@ -9,18 +10,14 @@ mongoc_cflags=
 
 if test x$with_[]modname != xno; then
 
-  AC_ARG_WITH(mongoc_lib_dir, [AC_HELP_STRING([--with-mongoc-lib-dir],
-              [Path of libmongoc libraries])],
+  AC_ARG_WITH(mongoc_lib_dir, [AS_HELP_STRING([--with-mongoc-lib-dir],[Path of libmongoc libraries])],
               [ mongoc_lib_dir="$withval" ], [ mongoc_lib_dir="" ])
-  AC_ARG_WITH(mongoc_include_dir, [AC_HELP_STRING([--with-mongoc-include-dir],
-              [Path of libmongoc includes])],
+  AC_ARG_WITH(mongoc_include_dir, [AS_HELP_STRING([--with-mongoc-include-dir],[Path of libmongoc includes])],
               [ mongoc_include_dir="$withval" ], [ mongoc_include_dir="" ])
 
-  AC_ARG_WITH(bson_lib_dir, [AC_HELP_STRING([--with-bson-lib-dir],
-              [Path of libbson libraries])],
+  AC_ARG_WITH(bson_lib_dir, [AS_HELP_STRING([--with-bson-lib-dir],[Path of libbson libraries])],
               [ bson_lib_dir="$withval" ], [ bson_lib_dir="" ])
-  AC_ARG_WITH(bson_include_dir, [AC_HELP_STRING([--with-bson-include-dir],
-              [Path of libbson includes])],
+  AC_ARG_WITH(bson_include_dir, [AS_HELP_STRING([--with-bson-include-dir],[Path of libbson includes])],
               [ bson_include_dir="$withval" ], [ bson_include_dir="" ])
 
   dnl ######################################################
@@ -123,4 +120,5 @@ fi
 AC_SUBST(mongoc_cflags)
 AC_SUBST(mongoc_ldflags)
 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.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac
index 00e07b628049504f795911e7ebcf57b06bd1e9c3..e243901f3f8b49cc075e915627696816f6f61337 100644 (file)
--- 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.59])
-AC_INIT(rlm_sql_mysql.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql_mysql.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sql_mysql])
 AC_CONFIG_HEADER(config.h)
@@ -187,7 +188,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 <mysql.h>], [int a = 1;], have_mysql_h=yes)
+               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mysql.h>]], [[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 <mysql.h>])
@@ -198,7 +199,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 <mysql.h>], [int a = 1;], have_mysql_h=yes)
+                       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mysql.h>]], [[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 <mysql.h>])
@@ -216,7 +217,7 @@ if test x$with_[]modname != xno; then
                old_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $mod_cflags"
                AC_MSG_CHECKING([for mysql.h (using mariadb_config --cflags)])
-               AC_TRY_COMPILE([#include <mysql.h>], [int a = 1;], have_mysql_h=yes)
+               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mysql.h>]], [[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 <mysql.h>])
@@ -227,7 +228,7 @@ if test x$with_[]modname != xno; then
                        mod_cflags="$(mariadb_config --include)"
                        CFLAGS="$old_CFLAGS $mod_cflags"
                        AC_MSG_CHECKING([for mysql.h (using mariadb_config --include)])
-                       AC_TRY_COMPILE([#include <mysql.h>], [int a = 1;], have_mysql_h=yes)
+                       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mysql.h>]], [[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 <mysql.h>])
@@ -272,4 +273,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.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
index a320b856270d2cc1660a1c1d9ed319c921ebde9f..e76691ab8d5c1c4074fbada95d3ef5fd835bf2f6 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_sql_oracle.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql_oracle.c])
 AC_REVISION($Revision: 1.10 $)
 FR_INIT_MODULE([rlm_sql_oracle])
 
@@ -103,7 +104,7 @@ if test x$with_[]modname != xno; then
 
            LIBS="$old_LIBS -L$path -Wl,-rpath,$path -lclntsh -lnnz${oracle_version}"
 
-           AC_TRY_LINK([#include <oci.h>
+           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <oci.h>
 
                static OCIEnv           *p_env;
                static OCIError         *p_err;
@@ -111,8 +112,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;
@@ -124,9 +124,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
@@ -167,4 +165,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.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
index 01c3c85194c4af56651d60bbc55619979b63173b..0f7588c3e190ca16ce91baa8232eb122202b0152 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_sql_postgresql.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql_postgresql.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sql_postgresql])
 
@@ -129,4 +130,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.ac b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/configure.ac
index 3caa2923035c93b6ac293626208d2ea4ef4f7189..d45e3f208a19105669866063cd77a2f4f3b5523a 100644 (file)
--- 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.59])
-AC_INIT(rlm_sql_sqlite.c)
+AC_PREREQ([2.69])
+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.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac
index 318cf7d9e4caf3dbcb0bf14106d89a599dff19d2..98de975400183edd905b643c385920d9309b6f60 100644 (file)
--- 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.59])
-AC_INIT(rlm_sql_unixodbc.c)
+AC_PREREQ([2.69])
+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_sql_map/configure.ac b/src/modules/rlm_sql_map/configure.ac
index ef8b797cb6cc538b7608f2d3298bcd3edc421758..4eb67167aa4fd05c018e111ce02550bacb0c3b13 100644 (file)
--- a/src/modules/rlm_sql_map/configure.ac
+++ b/src/modules/rlm_sql_map/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.59])
-AC_INIT(rlm_sql_map.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sql_map.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sql_map])
 
@@ -19,4 +20,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_sqlcounter/configure.ac b/src/modules/rlm_sqlcounter/configure.ac
index ad631b6bd136207077e59ff3bed1b689aa131468..199138507ed81be80e6bd28f9188bae3fad2a2a0 100644 (file)
--- a/src/modules/rlm_sqlcounter/configure.ac
+++ b/src/modules/rlm_sqlcounter/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_sqlcounter.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sqlcounter.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sqlcounter])
 
@@ -29,4 +30,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_sqlippool/configure.ac b/src/modules/rlm_sqlippool/configure.ac
index a1a954364c3a78424b1c749227f9e5e190762601..d1e055a81da3a4002470e0d402ad7643dbea8ce6 100644 (file)
--- a/src/modules/rlm_sqlippool/configure.ac
+++ b/src/modules/rlm_sqlippool/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.59])
-AC_INIT(rlm_sqlippool.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_sqlippool.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_sqlippool], [support for IP pools in SQL])
 
@@ -19,4 +20,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.ac b/src/modules/rlm_unbound/configure.ac
index 8b03f963260c7558fa6e5ee0715604fe227bcd0d..27ec7a2c4ce146961e3b8dfcddeb3d5827ba2ace 100644 (file)
--- a/src/modules/rlm_unbound/configure.ac
+++ b/src/modules/rlm_unbound/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_unbound.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_unbound.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_unbound])
 
@@ -73,4 +74,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.ac b/src/modules/rlm_unix/configure.ac
index 8bf355bd2d97b7ccdb3e15534b8b15c6259d4e6f..884e82319e64a8dd6528fa50b008b2c46f9bd61c 100644 (file)
--- a/src/modules/rlm_unix/configure.ac
+++ b/src/modules/rlm_unix/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_unix.c)
+AC_PREREQ([2.69])
+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_yubikey/configure.ac b/src/modules/rlm_yubikey/configure.ac
index 01afa67209c659be2a4a479929e2fd7ad89aadc6..11e4acf25eca9258ccbef2d14f849cedd8db6912 100644 (file)
--- a/src/modules/rlm_yubikey/configure.ac
+++ b/src/modules/rlm_yubikey/configure.ac
@@ -1,5 +1,6 @@
-AC_PREREQ([2.68])
-AC_INIT(rlm_yubikey.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([rlm_yubikey.c])
 AC_REVISION($Revision$)
 FR_INIT_MODULE([rlm_yubikey], [Yubikey support])
 
@@ -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