X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=6cf97e470391aca891a603bc2a0168b038a1b488;hb=e7c899a5194c472fff767ec7cd4683a5ffffa6f7;hp=4ec775672d77d025a08bd9fd37fbc7910ab847ed;hpb=ea5311578d4521cd10fa752d79678234d2c788c3;p=freeradius.git

diff --git a/configure.in b/configure.in
index 4ec7756..6cf97e4 100644
--- a/configure.in
+++ b/configure.in
@@ -72,18 +72,29 @@ 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-libltdl,
+[  --with-system-libltdl   Use the libltdl installed in your system (default=use our own)],
+[
+LIBLTDL="-lltdl"
+INCLTDL=
+LTDL_SUBDIRS=
+enable_ltdl_install=no
+],
+[
+dnl If libltdl isn't installable, set it to be installable.
+[test x"$enable_ltdl_install" = x && enable_ltdl_install=yes]
 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"
@@ -512,8 +523,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,
     [
@@ -531,6 +543,7 @@ if test "x$WITH_OPENSSL" = xyes; then
 	    ], [])
     ], [])
   LIBS=$old_LIBS
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 AC_CHECK_LIB(ws2_32, htonl)
@@ -544,8 +557,7 @@ AC_CHECK_LIB(pcap, pcap_open_live,
 	],
 	[ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
 
-AC_CHECK_LIB(readline, readline,
-	[ LIBREADLINE="-lreadline" AC_SUBST(LIBREADLINE) ])
+AC_LIB_READLINE
 
 dnl #############################################################
 dnl #
@@ -603,7 +615,6 @@ AC_CHECK_HEADERS( \
 	sys/fcntl.h \
 	sys/prctl.h \
 	sys/un.h \
-	readline/readline.h \
 	glob.h \
 	prot.h \
 	pwd.h \
@@ -828,6 +839,9 @@ AC_CHECK_FUNCS( \
 	closefrom \
 	gettimeofday \
 	getpeereid \
+	setuid \
+	setresuid \
+	getresuid \
 	strlcat \
 	strlcpy
 )
@@ -921,6 +935,11 @@ 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,
@@ -1181,5 +1200,6 @@ AC_OUTPUT(\
 	./scripts/radiusd.cron.monthly \
 	./scripts/cryptpasswd \
 	./raddb/dictionary \
+	./raddb/radrelay.conf \
 	./raddb/radiusd.conf
 )