X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=7c9a3a1519d5b0325174f1b6082e1fbb5bb128e0;hb=ae546052afad0d65f5bca4e1b0d8935472e149b8;hp=29cf7ff269edb35303869133f26fcf5c15f131a4;hpb=d20c92703a0aaeea2b5dce449300b7726362c3f1;p=freeradius.git diff --git a/configure.in b/configure.in index 29cf7ff..7c9a3a1 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-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 ############################################################# @@ -72,12 +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" @@ -107,7 +124,7 @@ AC_ARG_WITH(docdir, [ --with-docdir=DIR Directory for documentation [DATADIR/doc/freeradius] ], [ case "$withval" in no) - AC_MSG_ERROR(Need docdir) + docdir=no ;; yes) ;; @@ -121,6 +138,9 @@ AC_ARG_WITH(docdir, ) 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' @@ -215,25 +235,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 @@ -274,6 +302,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, @@ -286,6 +319,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 # @@ -474,12 +521,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, @@ -492,7 +542,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= @@ -503,6 +557,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 @@ -520,6 +576,7 @@ case "$host" in ;; *-darwin*) CFLAGS="$CFLAGS -DDARWIN" + LIBS="-framework DirectoryService $LIBS" ;; esac @@ -533,6 +590,7 @@ AC_CHECK_HEADERS( \ crypt.h \ errno.h \ resource.h \ + sys/resource.h \ getopt.h \ malloc.h \ utmp.h \ @@ -549,17 +607,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 +# endif +]) + REGEX=no AC_CHECK_HEADER(regex.h, AC_DEFINE(HAVE_REGEX_H, [], [define this if we have the header file])) if test "x$ac_cv_header_regex_h" = "xyes"; then @@ -590,9 +660,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" @@ -603,6 +674,7 @@ else openssl/ssl.h \ openssl/crypto.h \ openssl/err.h \ + openssl/evp.h \ openssl/engine.h, [], OPENSSL_LIBS= @@ -628,6 +700,7 @@ else fi fi CPPFLAGS=$old_CPPFLAGS + fi fi AC_SUBST(OPENSSL_INCLUDE) AC_SUBST(OPENSSL_LIBS) @@ -643,6 +716,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) @@ -757,7 +839,6 @@ AC_CHECK_FUNCS( \ inet_aton \ inet_pton \ inet_ntop \ - gethostname \ setlinebuf \ setvbuf \ getusershell \ @@ -765,6 +846,11 @@ AC_CHECK_FUNCS( \ getaddrinfo \ getnameinfo \ closefrom \ + gettimeofday \ + getpeereid \ + setuid \ + setresuid \ + getresuid \ strlcat \ strlcpy ) @@ -773,7 +859,6 @@ RADIUSD_NEED_DECLARATIONS( \ strncasecmp \ strcasecmp \ inet_aton \ - gethostname \ setlinebuf \ getusershell \ endusershell @@ -847,16 +932,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, @@ -874,10 +966,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]) @@ -892,9 +980,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 +#endif +]) ;; esac if test "x$gethostbyaddrrstyle" = "x"; then @@ -1024,13 +1123,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 ############################################################# @@ -1075,7 +1167,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 ############################################################# @@ -1087,7 +1179,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 @@ -1113,11 +1205,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 )