append tunneled reply, rather than moving it

[freeradius.git] / configure.in

diff --git a/configure.in b/configure.in
index fa8905a..a7412ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,6 @@ AC_AIX
 
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_CC_SUNPRO
-AC_PROG_RANLIB
 
 dnl Compile in large (2G+) file support.
 AC_SYS_LARGEFILE
@@ -81,6 +80,11 @@ if test x"$enable_ltdl_install" = x"yes"; then
 fi
 AC_SUBST(LTDL_SUBDIRS)
 
+
+AC_CONFIG_MACRO_DIR([libltdl/m4])
+dnl Stupid autoconf doesn't set ac_aux_dir  WTF?
+AC_CONFIG_AUX_DIR([.])
+
 dnl use system-wide libtool, if it exists
 AC_ARG_WITH(system-libtool,
 [  --with-system-libtool              try to use libtool installed in your system [default=use our own]],
@@ -89,6 +93,10 @@ AC_ARG_WITH(system-libtool,
   LIBTOOL="`pwd`/libtool"
   AC_SUBST(LIBTOOL)
   dnl ensure that we're looking for dlopen
+  LT_CONFIG_LTDL_DIR([libltdl])
+  LT_INIT
+  LTDL_INIT
+  AC_CONFIG_AUX_DIR([libltdl/config])
   AC_LIBTOOL_DLOPEN
 
   dnl Figure out how to build shared libraries
@@ -224,29 +232,6 @@ AC_ARG_WITH(threads,
   esac ]
 )
 
-dnl extra argument: --with-snmp
-WITH_SNMP=yes
-AC_ARG_WITH(snmp,
-[  --with-snmp             Compile in SNMP support. (default=yes)],
-[ case "$withval" in
-    yes)
-        ;;
-    *)
-       WITH_SNMP=no
-  esac ]
-)
-
-dnl #
-dnl # extra argument: --with-snmp-include-dir
-dnl #
-AC_ARG_WITH(snmp-include-dir,
-[  --with-snmp-include-dir=DIR  Directory to look for include files used by SNMP],
-[ case "$withval" in
-    *)
-       ;;
-  esac ]
-)
-
 dnl extra argument: --with-vmps
 WITH_VMPS=yes
 AC_ARG_WITH(vmps,
@@ -314,6 +299,11 @@ if test "x$developer" != "xno" -a -d $srcdir/CVS; then
   developer="yes"
 fi
 
+if test "x$developer" != "xno" -a -d $srcdir/.git; then
+  dnl turn on the developer flag when taken from a git checkout (not a release)
+  developer="yes"
+fi
+
 dnl extra argument: --with-experimental-modules
 EXPERIMENTAL=
 AC_ARG_WITH(experimental-modules,
@@ -413,7 +403,7 @@ dnl AC_SUBST(IQUOTE)
 dnl extra argument: --with-udpfromto
 WITH_UDPFROMTO=no
 AC_ARG_WITH(udpfromto,
-[  --with-udpfromto        Compile in UDPFROMTO support. (default=yes)],
+[  --with-udpfromto        Compile in UDPFROMTO support. (default=no)],
 [ case "$withval" in
     yes)
        WITH_UDPFROMTO=yes
@@ -530,8 +520,9 @@ dnl Check for OpenSSL libraries.
 OPENSSL_LIBS=
 if test "x$WITH_OPENSSL" = xyes; then
   old_LIBS=$LIBS
+  old_LDFLAGS="$LDFLAGS"
   if test "x$OPENSSL_LIB_DIR" != "x"; then
-    LIBS="-L$OPENSSL_LIB_DIR $LIBS"
+    LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
   fi
   AC_CHECK_LIB(crypto, DH_new,
     [
@@ -549,6 +540,7 @@ if test "x$WITH_OPENSSL" = xyes; then
            ], [])
     ], [])
   LIBS=$old_LIBS
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 AC_CHECK_LIB(ws2_32, htonl)
@@ -562,6 +554,8 @@ AC_CHECK_LIB(pcap, pcap_open_live,
        ],
        [ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
 
+AC_LIB_READLINE
+
 dnl #############################################################
 dnl #
 dnl #  3. Checks for header files
@@ -617,6 +611,8 @@ AC_CHECK_HEADERS( \
        fcntl.h \
        sys/fcntl.h \
        sys/prctl.h \
+       sys/un.h \
+       glob.h \
        prot.h \
        pwd.h \
        grp.h \
@@ -839,6 +835,10 @@ AC_CHECK_FUNCS( \
        getnameinfo \
        closefrom \
        gettimeofday \
+       getpeereid \
+       setuid \
+       setresuid \
+       getresuid \
        strlcat \
        strlcpy
 )
@@ -924,6 +924,8 @@ else
   AC_MSG_RESULT(no.)
 fi
 
+FR_TLS
+
 dnl #############################################################
 dnl #
 dnl #  7. Checks for library functions
@@ -947,10 +949,6 @@ AC_CHECK_LIB(cipher, setkey,
 )
 AC_SUBST(CRYPTLIB)
 
-if test "x$WITH_SNMP" = "xyes"; then
-  SNMP_CHECKS
-fi
-
 dnl Check the style of gethostbyaddr, in order of preference
 dnl GNU (_r eight args)
 AC_DEFINE(GNUSTYLE, [1], [GNU-Style get*byaddr_r])
@@ -1164,7 +1162,7 @@ dnl #############################################################
 AC_CONFIG_COMMANDS([stamp-h], [echo timestamp > src/include/stamp-h])
 AC_CONFIG_COMMANDS([build-radpaths-h], [(cd ./src/include && /bin/sh ./build-radpaths-h)])
 AC_CONFIG_COMMANDS([main-chmod], [(cd ./src/main   && chmod +x checkrad.pl radlast radtest)])
-AC_CONFIG_COMMANDS([scripts-chmod], [(cd ./scripts    && chmod +x rc.radiusd radwatch check-radiusd-config radiusd.cron.daily radiusd.cron.monthly cryptpasswd)])
+AC_CONFIG_COMMANDS([scripts-chmod], [(cd ./scripts    && chmod +x rc.radiusd radwatch radiusd.cron.daily radiusd.cron.monthly cryptpasswd)])
 
 dnl #
 dnl #  Substitute whatever libraries we found to be necessary