X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=d338aa6ebf8a0f7dd93e502ae8fe4e7c64b92a70;hb=3fe7a409cbbc70bf0bee41c46a38d6fdfa77c697;hp=6ae6aa71b38d2ddeac1ba228cd86ef6cacab9f59;hpb=64c447ee26d79773230ddf37631058128fe301fe;p=freeradius.git

diff --git a/configure.in b/configure.in
index 6ae6aa7..d338aa6 100644
--- a/configure.in
+++ b/configure.in
@@ -27,9 +27,9 @@ AC_CONFIG_HEADER(src/include/autoconf.h)
 AC_REVISION($Revision$)dnl
 
 dnl # The version of the software
-RADIUSD_MAJOR_VERSION=2
-RADIUSD_MINOR_VERSION=0.0-pre1
-RADIUSD_VERSION="${RADIUSD_MAJOR_VERSION}.${RADIUSD_MINOR_VERSION}"
+RADIUSD_VERSION=`cat VERSION`
+RADIUSD_MAJOR_VERSION=`cat VERSION | sed 's/\..*//'`
+RADIUSD_MINOR_VERSION=`cat VERSION | sed 's/^2\.//'`
 PACKAGE=freeradius
 
 dnl #############################################################
@@ -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,17 +233,33 @@ 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)],
+dnl extra argument: --with-vmps
+WITH_VMPS=yes
+AC_ARG_WITH(vmps,
+[  --with-vmps             Compile in VMPS support. (default=yes)],
 [ case "$withval" in
     yes)
         ;;
     *)
-	WITH_SNMP=no
+	WITH_VMPS=no
   esac ]
 )
+if test "x$WITH_VMPS" = "xyes"; then
+	AC_DEFINE(WITH_VMPS, [1], [define if you want VMPS support])
+fi
+
+dnl extra argument: --with-dhcp
+AC_ARG_WITH(dhcp,
+[  --with-dhcp             Compile in DHCP support. (default=no)],
+[ case "$withval" in
+    yes)
+        AC_DEFINE(WITH_DHCP, [1], [Include experimental support for DHCP])
+	;;
+    *)
+	;;
+  esac ]
+)
+
 
 dnl #
 dnl #  Allow the user to specify a list of modules to be linked
@@ -275,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,
@@ -287,6 +317,20 @@ AC_ARG_WITH(experimental-modules,
   esac ]
 )
 
+dnl extra argument: --with-openssl
+WITH_OPENSSL=yes
+AC_ARG_WITH(openssl,
+[  --with-openssl                   Use OpenSSL. (default=yes)],
+[ case "$withval" in
+    no)
+	WITH_OPENSSL=no
+	;;
+    *)
+	WITH_OPENSSL=yes
+	;;
+  esac ]
+)
+
 dnl #
 dnl # extra argument: --with-openssl-includes=dir
 dnl #
@@ -358,9 +402,9 @@ dnl AC_SUBST(INCLUDE)
 dnl AC_SUBST(IQUOTE)
 
 dnl extra argument: --with-udpfromto
-WITH_UDPFROMTO=yes
+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
@@ -475,12 +519,15 @@ AC_CHECK_LIB(nsl, inet_ntoa)
 
 dnl Check for OpenSSL libraries.
 OPENSSL_LIBS=
-old_LIBS=$LIBS
-if test "x$OPENSSL_LIB_DIR" != "x"; then
-    LIBS="-L$OPENSSL_LIB_DIR $LIBS"
-fi
-AC_CHECK_LIB(crypto, DH_new,
+if test "x$WITH_OPENSSL" = xyes; then
+  old_LIBS=$LIBS
+  old_LDFLAGS="$LDFLAGS"
+  if test "x$OPENSSL_LIB_DIR" != "x"; then
+    LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
+  fi
+  AC_CHECK_LIB(crypto, DH_new,
     [
+	LIBS="-lcrypto $LIBS"
 	AC_DEFINE(HAVE_LIBCRYPTO, 1,
 	    [Define to 1 if you have the `crypto' library (-lcrypto).])
 	AC_CHECK_LIB(ssl, SSL_new,
@@ -493,7 +540,9 @@ AC_CHECK_LIB(crypto, DH_new,
 		OPENSSL_LIBS="$OPENSSL_LIBS -lcrypto -lssl -lcrypto"
 	    ], [])
     ], [])
-LIBS=$old_LIBS
+  LIBS=$old_LIBS
+  LDFLAGS="$old_LDFLAGS"
+fi
 
 AC_CHECK_LIB(ws2_32, htonl)
 
@@ -506,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
@@ -523,6 +574,7 @@ case "$host" in
 	;;
 *-darwin*)
 	CFLAGS="$CFLAGS -DDARWIN"
+	LIBS="-framework DirectoryService $LIBS"
 	;;
 esac
 
@@ -559,7 +611,9 @@ AC_CHECK_HEADERS( \
 	sys/security.h \
 	fcntl.h \
 	sys/fcntl.h \
-	net/if.h \
+	sys/prctl.h \
+	sys/un.h \
+	glob.h \
 	prot.h \
 	pwd.h \
 	grp.h \
@@ -567,6 +621,13 @@ AC_CHECK_HEADERS( \
 	siad.h
 )
 
+dnl FreeBSD requires sys/socket.h before net/if.h
+AC_CHECK_HEADERS(net/if.h, [], [],
+[#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+# endif
+])
+
 REGEX=no
 AC_CHECK_HEADER(regex.h, AC_DEFINE(HAVE_REGEX_H, [], [define this if we have the <regex.h> header file]))
 if test "x$ac_cv_header_regex_h" = "xyes"; then
@@ -597,9 +658,10 @@ fi
 
 dnl Check for OpenSSL includes.
 OPENSSL_INCLUDE="-DNO_OPENSSL"
-if test "x$OPENSSL_LIBS" = "x"; then
+if test "x$WITH_OPENSSL" = xyes; then
+  if test "x$OPENSSL_LIBS" = "x"; then
     AC_MSG_NOTICE([skipping test for openssl/ssl.h])
-else
+  else
     old_CPPFLAGS=$CPPFLAGS
     if test "x$OPENSSL_INCLUDE_DIR" != "x"; then
 	CPPFLAGS="$CPPFLAGS -I$OPENSSL_INCLUDE_DIR"
@@ -610,6 +672,7 @@ else
 	openssl/ssl.h \
 	openssl/crypto.h \
 	openssl/err.h \
+	openssl/evp.h \
 	openssl/engine.h,
 	[],
 	OPENSSL_LIBS=
@@ -635,6 +698,7 @@ else
 	fi
     fi
     CPPFLAGS=$old_CPPFLAGS
+  fi
 fi
 AC_SUBST(OPENSSL_INCLUDE)
 AC_SUBST(OPENSSL_LIBS)
@@ -772,6 +836,10 @@ AC_CHECK_FUNCS( \
 	getnameinfo \
 	closefrom \
 	gettimeofday \
+	getpeereid \
+	setuid \
+	setresuid \
+	getresuid \
 	strlcat \
 	strlcpy
 )
@@ -853,16 +921,23 @@ if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then
 else
   devflags=""
   CFLAGS="$CFLAGS -DNDEBUG"
-  INSTALLSTRIP="-s"
+  INSTALLSTRIP=""
   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,
@@ -880,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])
@@ -898,9 +969,20 @@ gethostbyaddrrstyle=""
 AC_MSG_CHECKING([gethostbyaddr_r() syntax])
 case "$host" in
 *-freebsd*)
-	AC_DEFINE(GETHOSTBYADDRRSTYLE, BSDSTYLE, [style of gethostbyaddr_r functions ])
-	gethostbyaddrrstyle=BSD
-	AC_MSG_WARN([FreeBSD overridden to BSD-style])
+dnl With FreeBSD, check if there's a prototype for gethostbyaddr_r.
+dnl Some versions (FreeBSD 5.1?) have a symbol but no prototype - so we
+dnl override this test to BSDSTYLE. FreeBSD 6.2 and up have proper GNU
+dnl style support.
+	AC_CHECK_DECLS([gethostbyaddr_r], [], [
+		AC_DEFINE(GETHOSTBYADDRRSTYLE, BSDSTYLE,
+			[style of gethostbyaddr_r functions ])
+		gethostbyaddrrstyle=BSD
+		AC_MSG_WARN([FreeBSD overridden to BSD-style])
+	], [
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+])
 	;;
 esac
 if test "x$gethostbyaddrrstyle" = "x"; then
@@ -1086,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
@@ -1112,11 +1194,10 @@ AC_OUTPUT(\
 	./src/main/radtest \
 	./scripts/rc.radiusd \
 	./scripts/radwatch \
-	./scripts/check-radiusd-config \
 	./scripts/radiusd.cron.daily \
 	./scripts/radiusd.cron.monthly \
 	./scripts/cryptpasswd \
 	./raddb/dictionary \
-	./raddb/radiusd.conf \
-	./raddb/radrelay.conf
+	./raddb/radrelay.conf \
+	./raddb/radiusd.conf
 )