X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=da1b57ccb09e11facbaadef7ca0208810c6fce60;hb=0b75b1a7dec6bbe65e4d05632f85d7babafbb753;hp=c7d41e629f41186cef968e3916de0237665e58a0;hpb=828b0822b55ade5cd24b54e1c6e505685da5d965;p=freeradius.git

diff --git a/configure.in b/configure.in
index c7d41e6..da1b57c 100644
--- a/configure.in
+++ b/configure.in
@@ -72,14 +72,17 @@ if test -z "$makever"; then
 		from ftp://prep.ai.mit.edu/pub/gnu/make/ before continuing.)
 fi
 
-AC_ARG_WITH(system-libtldl,
-[  --with-system-libtldl   Use the libtltdl installed in your system (default=use our own)],
+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
@@ -92,7 +95,8 @@ AC_SUBST(LTDL_SUBDIRS)
 dnl use system-wide libtool, if it exists
 AC_ARG_WITH(system-libtool,
 [  --with-system-libtool   Use the libtool installed in your system (default=use our own)],
-[ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin) ],
+[ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin) AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL],
 [
   LIBTOOL="`pwd`/libtool"
   AC_SUBST(LIBTOOL)
@@ -520,8 +524,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,
     [
@@ -539,6 +544,7 @@ if test "x$WITH_OPENSSL" = xyes; then
 	    ], [])
     ], [])
   LIBS=$old_LIBS
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 AC_CHECK_LIB(ws2_32, htonl)
@@ -711,6 +717,15 @@ else
 	[ PCAP_LIBS=
 	AC_MSG_WARN([pcap.h not found, silently disabling the RADIUS sniffer.])
 	])
+
+    AC_CHECK_LIB(pcap, pcap_fopen_offline,
+	[ AC_DEFINE(HAVE_PCAP_FOPEN_OFFLINE, 1,
+		[Define to 1 if you have the function pcap_fopen_offline.])
+	])
+    AC_CHECK_LIB(pcap, pcap_dump_fopen,
+	[ AC_DEFINE(HAVE_PCAP_DUMP_FOPEN, 1,
+		[Define to 1 if you have the function pcap_dump_fopen.])
+	])
 fi
 AC_SUBST(PCAP_LIBS)
 
@@ -930,6 +945,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,