X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure;h=022ad9db79bd49bdadd1f526bdb28297d251719c;hb=refs%2Fheads%2Feap-chbind;hp=be6779be6415c414a717f5a12e756d3afa11763b;hpb=ba7ff87d14cce0897e832665b9d4b9957fc99af1;p=freeradius.git

diff --git a/configure b/configure
index be6779b..022ad9d 100755
--- a/configure
+++ b/configure
@@ -1489,7 +1489,7 @@ Optional Packages:
   --with-ascend-binary    Include support for Ascend binary filter attributes (default=yes)
   --with-threads          Use threads, if available.  (default=yes)
   --with-vmps             Compile in VMPS support. (default=yes)
-  --with-dhcp             Compile in DHCP support. (default=no)
+  --with-dhcp             Compile in DHCP support. (default=yes)
   --with-static-modules=QUOTED-MODULE-LIST
  --with-modules=QUOTED-MODULE-LIST
   --with-experimental-modules      Use experimental and unstable modules. (default=no)
@@ -3824,6 +3824,10 @@ else
 fi
 
 
+if test "x$GCC" = "xyes"; then
+    CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE"
+fi
+
 # Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval=$enable_largefile;
@@ -4792,7 +4796,7 @@ fi
 if test "${with_system_libltdl+set}" = set; then
   withval=$with_system_libltdl;
 LIBLTDL="-lltdl"
-INCLTDL=
+INCLTDL=-DWITH_SYSTEM_LTDL
 LTDL_SUBDIRS=
 
 else
@@ -20091,9 +20095,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-else
 
-  LIBTOOL="`pwd`/libtool"
 
 
 
@@ -20103,6 +20105,10 @@ else
 
 
 
+else
+
+  LIBTOOL="`pwd`/libtool"
+
 
 
 
@@ -20297,25 +20303,31 @@ _ACEOF
 
 fi
 
+WITH_DHCP=yes
 
 # Check whether --with-dhcp was given.
 if test "${with_dhcp+set}" = set; then
   withval=$with_dhcp;  case "$withval" in
     yes)
+        ;;
+    *)
+	WITH_DHCP=no
+  esac
+
+fi
+
+if test "x$WITH_DHCP" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define WITH_DHCP 1
 _ACEOF
 
-	;;
-    *)
-	;;
-  esac
-
 fi
 
 
 
+
+
 STATIC_MODULES=
 
 # Check whether --with-static_modules was given.
@@ -22726,6 +22738,8 @@ fi
 
 
 
+
+
 for ac_header in \
 	unistd.h \
 	crypt.h \
@@ -22760,6 +22774,8 @@ for ac_header in \
 	prot.h \
 	pwd.h \
 	grp.h \
+	stddef.h \
+        fnmatch.h \
 	sia.h \
 	siad.h
 
@@ -23162,11 +23178,16 @@ echo "$as_me: skipping test for openssl/ssl.h" >&6;}
 
 
 
+
 for ac_header in \
 	openssl/ssl.h \
 	openssl/crypto.h \
 	openssl/err.h \
 	openssl/evp.h \
+	openssl/md5.h \
+	openssl/md4.h \
+	openssl/sha.h \
+	openssl/ocsp.h \
 	openssl/engine.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23494,6 +23515,147 @@ echo "$as_me: WARNING: pcap.h not found, silently disabling the RADIUS sniffer."
 fi
 
 
+
+    { echo "$as_me:$LINENO: checking for pcap_fopen_offline in -lpcap" >&5
+echo $ECHO_N "checking for pcap_fopen_offline in -lpcap... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcap_pcap_fopen_offline+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcap  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcap_fopen_offline ();
+int
+main ()
+{
+return pcap_fopen_offline ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcap_pcap_fopen_offline=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pcap_pcap_fopen_offline=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcap_pcap_fopen_offline" >&5
+echo "${ECHO_T}$ac_cv_lib_pcap_pcap_fopen_offline" >&6; }
+if test $ac_cv_lib_pcap_pcap_fopen_offline = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PCAP_FOPEN_OFFLINE 1
+_ACEOF
+
+
+fi
+
+    { echo "$as_me:$LINENO: checking for pcap_dump_fopen in -lpcap" >&5
+echo $ECHO_N "checking for pcap_dump_fopen in -lpcap... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcap_pcap_dump_fopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcap  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcap_dump_fopen ();
+int
+main ()
+{
+return pcap_dump_fopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcap_pcap_dump_fopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pcap_pcap_dump_fopen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcap_pcap_dump_fopen" >&5
+echo "${ECHO_T}$ac_cv_lib_pcap_pcap_dump_fopen" >&6; }
+if test $ac_cv_lib_pcap_pcap_dump_fopen = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PCAP_DUMP_FOPEN 1
+_ACEOF
+
+
+fi
+
 fi
 
 
@@ -24632,6 +24794,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <utmpx.h>
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
 #endif
@@ -24705,6 +24870,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <netinet/in.h>
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
 #endif
@@ -24777,6 +24945,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <netinet/in.h>
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
 #endif
@@ -24956,10 +25127,6 @@ else
 fi
 
 
-if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE"
-fi
-
 { echo "$as_me:$LINENO: checking for developer gcc flags" >&5
 echo $ECHO_N "checking for developer gcc flags... $ECHO_C" >&6; }
 if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then
@@ -25121,7 +25288,7 @@ echo "${ECHO_T}$ac_cv_func_lt_dladvise_init" >&6; }
 if test $ac_cv_func_lt_dladvise_init = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_HAVE_LT_DLADVISE_INIT
+#define HAVE_LT_DLADVISE_INIT
 _ACEOF
 
 fi
@@ -26016,7 +26183,7 @@ USE_STATIC_LIBS=$enable_static
   unset ac_cv_env_LIBS_set
   unset ac_cv_env_LIBS_value
 
-  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/Makefile ./src/main/checkrad.pl ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/radwatch ./scripts/radiusd.cron.daily ./scripts/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radrelay.conf ./raddb/radiusd.conf"
+  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/Makefile ./src/main/radsniff.mk ./src/main/checkrad.pl ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/radwatch ./scripts/radiusd.cron.daily ./scripts/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radrelay.conf ./raddb/radiusd.conf"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure