X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=d338aa6ebf8a0f7dd93e502ae8fe4e7c64b92a70;hb=490112b74bf3ecfb291ad4d22a26eb4ffc1aee89;hp=fa8905a75559e3b9a51c1a0f04ef3eae8b5961dd;hpb=2451eafcf766b113a53048a22611e7e144835c8c;p=freeradius.git

diff --git a/configure.in b/configure.in
index fa8905a..d338aa6 100644
--- a/configure.in
+++ b/configure.in
@@ -72,18 +72,27 @@ if test -z "$makever"; then
 		from ftp://prep.ai.mit.edu/pub/gnu/make/ before continuing.)
 fi
 
-dnl libltdl is installable
+AC_ARG_WITH(system-libtldl,
+[  --with-system-libtldl   Use the libltdl installed in your system (default=use our own)],
+[
+LIBLTDL="-lltdl"
+INCLTDL=
+LTDL_SUBDIRS=
+enable_ltdl_install=no
+],
+[
 AC_LIBLTDL_INSTALLABLE
 
 dnl tell Makefile to build ltdl if needed
 if test x"$enable_ltdl_install" = x"yes"; then
   LTDL_SUBDIRS=libltdl
 fi
+])
 AC_SUBST(LTDL_SUBDIRS)
 
 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]],
+[  --with-system-libtool   Use the libtool installed in your system (default=use our own)],
 [ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin) ],
 [
   LIBTOOL="`pwd`/libtool"
@@ -224,29 +233,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 +300,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 +404,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 +521,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 +541,7 @@ if test "x$WITH_OPENSSL" = xyes; then
 	    ], [])
     ], [])
   LIBS=$old_LIBS
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 AC_CHECK_LIB(ws2_32, htonl)
@@ -562,6 +555,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 +612,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 +836,10 @@ AC_CHECK_FUNCS( \
 	getnameinfo \
 	closefrom \
 	gettimeofday \
+	getpeereid \
+	setuid \
+	setresuid \
+	getresuid \
 	strlcat \
 	strlcpy
 )
@@ -924,12 +925,19 @@ else
   AC_MSG_RESULT(no.)
 fi
 
+FR_TLS
+
 dnl #############################################################
 dnl #
 dnl #  7. Checks for library functions
 dnl #
 dnl #############################################################
 
+old_LIBS="$LIBS"
+LIBS="$LIBS $LIBLTDL"
+AC_CHECK_FUNC(lt_dladvise_init, AC_DEFINE(HAVE_HAVE_LT_DLADVISE_INIT, [], [Do we have the lt_dladvise_init function]))
+LIBS="$old_LIBS"
+
 dnl Check for libcrypt
 dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
 AC_CHECK_LIB(crypt, crypt,
@@ -947,10 +955,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 +1168,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
@@ -1194,5 +1198,6 @@ AC_OUTPUT(\
 	./scripts/radiusd.cron.monthly \
 	./scripts/cryptpasswd \
 	./raddb/dictionary \
+	./raddb/radrelay.conf \
 	./raddb/radiusd.conf
 )