X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=da1b57ccb09e11facbaadef7ca0208810c6fce60;hb=HEAD;hp=e4281876652bbce981b50eed71946aed9400beff;hpb=891baf87814297ce6fcda0d42bf9b90cdaf5d627;p=freeradius.git

diff --git a/configure.in b/configure.in
index e428187..da1b57c 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl #
 dnl #  For information about autoconf, see:
 dnl #
 dnl #  http://www.gnu.org/software/autoconf/
-dnl #  
+dnl #
 dnl #  The recommended order is:
 dnl #
 dnl #  AC_INIT(file)
@@ -20,16 +20,16 @@ dnl #  AC_OUTPUT([file...])
 dnl #
 dnl #############################################################
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.59])
 export CFLAGS LIBS LDFLAGS CPPFLAGS
 AC_INIT(src/main/radiusd.c)
 AC_CONFIG_HEADER(src/include/autoconf.h)
 AC_REVISION($Revision$)dnl
 
 dnl # The version of the software
-RADIUSD_MAJOR_VERSION=1
-RADIUSD_MINOR_VERSION=1.0-pre0
-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 #############################################################
@@ -52,9 +52,6 @@ AC_PROG_GCC_TRADITIONAL
 AC_PROG_CC_SUNPRO
 AC_PROG_RANLIB
 
-abs_top_builddir=`pwd`
-AC_SUBST(abs_top_builddir)
-
 dnl Compile in large (2G+) file support.
 AC_SYS_LARGEFILE
 
@@ -75,13 +72,31 @@ 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]],
-[ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin) ],
+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_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL],
 [
   LIBTOOL="`pwd`/libtool"
   AC_SUBST(LIBTOOL)
@@ -103,6 +118,31 @@ dnl 	awk '{print "                            "$0}']))
 AC_ARG_ENABLE(strict-dependencies,
 [  --enable-strict-dependencies  Fail configure on lack of module dependancy.])
 
+dnl extra argument: --with-docdir
+docdir='${datadir}/doc/freeradius'
+AC_MSG_CHECKING(docdir)
+AC_ARG_WITH(docdir,
+[  --with-docdir=DIR       Directory for documentation [DATADIR/doc/freeradius] ],
+[ case "$withval" in
+    no)
+	docdir=no
+	;;
+    yes)
+	;;
+    [[\\/$]]* | ?:[[\\/]]* )
+	docdir="$withval"
+	;;
+    *)
+	AC_MSG_ERROR([expected an absolute directory name for --with-docdir: $withval])
+	;;
+  esac ]
+)
+AC_SUBST(docdir)
+AC_MSG_RESULT($docdir)
+if test "x$docdir" = xno; then
+	AC_MSG_WARN(Documentation files will NOT be installed.)
+fi
+
 dnl extra argument: --with-logdir
 logdir='${localstatedir}/log/radius'
 AC_MSG_CHECKING(logdir)
@@ -114,9 +154,12 @@ AC_ARG_WITH(logdir,
 	;;
     yes)
 	;;
-    *)
+    [[\\/$]]* | ?:[[\\/]]* )
 	logdir="$withval"
 	;;
+    *)
+	AC_MSG_ERROR([expected an absolute directory name for --with-logdir: $withval])
+	;;
   esac ]
 )
 AC_SUBST(logdir)
@@ -126,16 +169,19 @@ dnl extra argument: --with-radacctdir
 radacctdir='${logdir}/radacct'
 AC_MSG_CHECKING(radacctdir)
 AC_ARG_WITH(radacctdir,
-[  --with-radacctdir=PATH  Directory for detail files [LOGDIR/radacct] ],
+[  --with-radacctdir=DIR   Directory for detail files [LOGDIR/radacct] ],
 [ case "$withval" in
     no)
 	AC_MSG_ERROR(Need radacctdir)
 	;;
     yes)
 	;;
-    *)
+    [[\\/$]]* | ?:[[\\/]]* )
 	radacctdir="$withval"
 	;;
+    *)
+	AC_MSG_ERROR([expected an absolute directory name for --with-radacctdir: $withval])
+	;;
   esac ]
 )
 AC_SUBST(radacctdir)
@@ -152,9 +198,12 @@ AC_ARG_WITH(raddbdir,
 	;;
     yes)
 	;;
-    *)
+    [[\\/$]]* | ?:[[\\/]]* )
 	raddbdir="$withval"
 	;;
+    *)
+	AC_MSG_ERROR([expected an absolute directory name for --with-raddbdir: $withval])
+	;;
   esac ]
 )
 AC_SUBST(raddbdir)
@@ -187,25 +236,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 AC_ARG_ENABLE(ltdl-install,
-dnl [  --disable-ltdl-install  do not install libltdl])
-dnl if test x"${enable_ltdl_install+set}" != xset; then
-dnl   enable_ltdl_install=yes
-dnl   ac_configure_args="$ac_configure_args --enable-ltdl-install"
-dnl fi
-dnl AC_CONFIG_SUBDIRS(libltdl)
 
 dnl #
 dnl #  Allow the user to specify a list of modules to be linked
@@ -219,6 +276,14 @@ AC_ARG_WITH(static_modules,
   done
 ])
 
+MODULES=
+AC_ARG_WITH(modules,
+[ --with-modules=QUOTED-MODULE-LIST],[
+ for i in $withval; do
+   MODULES="$MODULES $i"
+ done
+])
+
 dnl #
 dnl #  Enable developer C compiler warnings
 dnl #
@@ -238,6 +303,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,
@@ -250,6 +320,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 #
@@ -378,20 +462,20 @@ dnl #############################################################
 
 dnl If using pthreads, check for -lpthread (posix) or -lc_r (*BSD)
 old_CFLAGS=$CFLAGS
-if test "x$WITH_THREADS" = "xyes"; then 
+if test "x$WITH_THREADS" = "xyes"; then
   if test $ac_cv_prog_suncc = "yes"; then
     CFLAGS="$CFLAGS -mt"
   fi
 
   AC_CHECK_HEADERS(pthread.h, [], [ WITH_THREADS="no" ])
 
-dnl # 
+dnl #
 dnl # pthread stuff is usually in -lpthread
 dnl # or in -lc_r, on *BSD
-dnl # 
+dnl #
 dnl # On Some systems, we need extra pre-processor flags, to get them to
 dnl # to do the threading properly.
-dnl # 
+dnl #
   AC_CHECK_LIB(pthread, pthread_create,
 		[ CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
                   LIBS="$LIBS -lpthread" ],
@@ -402,9 +486,9 @@ dnl #
 		)
 fi
 
-dnl # 
+dnl #
 dnl # If we have NO pthread libraries, remove any knowledge of threads.
-dnl # 
+dnl #
 if test "x$WITH_THREADS" != "xyes"; then
   CFLAGS=$old_CFLAGS
   ac_cv_header_pthread_h="no"
@@ -438,12 +522,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,
@@ -456,7 +543,11 @@ 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)
 
 dnl Check the pcap library for the RADIUS sniffer.
 PCAP_LIBS=
@@ -467,6 +558,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
@@ -476,14 +569,15 @@ dnl #############################################################
 dnl #
 dnl # Interix requires us to set -D_ALL_SOURCE, otherwise
 dnl # getopt will be #included, but won't link.  <sigh>
-dnl # 
-dnl # 
+dnl #
+dnl #
 case "$host" in
 *-interix*)
 	CFLAGS="$CFLAGS -D_ALL_SOURCE"
 	;;
 *-darwin*)
 	CFLAGS="$CFLAGS -DDARWIN"
+	LIBS="-framework DirectoryService $LIBS"
 	;;
 esac
 
@@ -497,6 +591,7 @@ AC_CHECK_HEADERS( \
 	crypt.h \
 	errno.h \
 	resource.h \
+	sys/resource.h \
 	getopt.h \
 	malloc.h \
 	utmp.h \
@@ -513,17 +608,29 @@ AC_CHECK_HEADERS( \
 	netinet/in.h \
 	sys/types.h \
 	sys/socket.h \
+	winsock.h \
 	sys/time.h \
 	sys/wait.h \
 	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 \
 	sia.h \
 	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
@@ -554,9 +661,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"
@@ -567,6 +675,7 @@ else
 	openssl/ssl.h \
 	openssl/crypto.h \
 	openssl/err.h \
+	openssl/evp.h \
 	openssl/engine.h,
 	[],
 	OPENSSL_LIBS=
@@ -592,6 +701,7 @@ else
 	fi
     fi
     CPPFLAGS=$old_CPPFLAGS
+  fi
 fi
 AC_SUBST(OPENSSL_INCLUDE)
 AC_SUBST(OPENSSL_LIBS)
@@ -607,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)
 
@@ -619,7 +738,7 @@ dnl #############################################################
 dnl #
 dnl # Ensure that these are defined
 dnl #
-AC_TYPE_OFF_T 
+AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
@@ -721,7 +840,6 @@ AC_CHECK_FUNCS( \
 	inet_aton \
 	inet_pton \
 	inet_ntop \
-	gethostname \
 	setlinebuf \
 	setvbuf \
 	getusershell \
@@ -729,6 +847,11 @@ AC_CHECK_FUNCS( \
 	getaddrinfo \
 	getnameinfo \
 	closefrom \
+	gettimeofday \
+	getpeereid \
+	setuid \
+	setresuid \
+	getresuid \
 	strlcat \
 	strlcpy
 )
@@ -737,7 +860,6 @@ RADIUSD_NEED_DECLARATIONS( \
 	strncasecmp \
 	strcasecmp \
 	inet_aton \
-	gethostname \
 	setlinebuf \
 	getusershell \
 	endusershell
@@ -780,7 +902,7 @@ dnl #############################################################
 dnl #
 dnl # Ensure that these are defined
 dnl #
-AC_C_CONST 
+AC_C_CONST
 
 dnl #
 dnl # See if this is OS/2
@@ -811,16 +933,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,
@@ -838,10 +967,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])
@@ -856,9 +981,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
@@ -988,13 +1124,6 @@ dnl # AC_SUBST(top_builddir)
 AC_SUBST(LIBLTDL)
 AC_SUBST(INCLTDL)
 
-dnl #
-dnl #  Work around stupid autoconf crap
-dnl #
-if test "x$INCLTDL" != "x";then
-  INCLTDL='-I${top_builddir}/''libltdl'
-fi
-
 dnl import libtool stuff
 
 dnl #############################################################
@@ -1009,9 +1138,9 @@ if test "x$EXPERIMENTAL" = "xyes"; then
   dnl # get rid of LF's.
   mysubdirs=`echo $mysubdirs $bar`
 else
-  dnl # 
+  dnl #
   dnl # Find 'configure' in ONLY the stable modules
-  dnl # 
+  dnl #
   for bar in `cat "${srcdir}"/src/modules/stable`; do
     if test -f "${srcdir}"/src/modules/$bar/configure; then
       mysubdirs="$mysubdirs src/modules/$bar"
@@ -1022,7 +1151,6 @@ fi
 dnl ############################################################
 dnl # make modules by list
 dnl #############################################################
-MODULES=
 if test "x$EXPERIMENTAL" = "xyes"; then
   for foo in `ls -1 "${srcdir}"/src/modules | grep rlm_`; do
     MODULES="$MODULES $foo"
@@ -1040,7 +1168,7 @@ dnl #
 dnl #  Don't change the variable name here.  Autoconf goes bonkers
 dnl #  if you do.
 dnl #
-AC_CONFIG_SUBDIRS($mysubdirs)
+AC_CONFIG_SUBDIRS($LTDL_SUBDIRS $mysubdirs)
 AC_SUBST(MODULES)
 
 dnl #############################################################
@@ -1052,7 +1180,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
@@ -1078,11 +1206,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
 )