X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=blobdiff_plain;f=configure.in;h=da1b57ccb09e11facbaadef7ca0208810c6fce60;hp=3a166677acffc1e5531260937ac6e7bafe9e00ac;hb=HEAD;hpb=726cb64b814169a913e117a8f59028e4139adcaa diff --git a/configure.in b/configure.in index 3a16667..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,15 +20,17 @@ dnl # AC_OUTPUT([file...]) dnl # dnl ############################################################# +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 -AC_PREREQ([2.50]) dnl # The version of the software -RADIUSD_MAJOR_VERSION=1 -RADIUSD_MINOR_VERSION=1.3 -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 ############################################################# dnl # @@ -38,6 +40,7 @@ dnl ############################################################# dnl Check for GNU cc AC_PROG_CC +AC_PROG_CXX dnl # dnl # check for AIX, to allow us to use some BSD functions @@ -49,13 +52,8 @@ AC_PROG_GCC_TRADITIONAL AC_PROG_CC_SUNPRO AC_PROG_RANLIB -abs_top_builddir=`pwd` -AC_SUBST(abs_top_builddir) - -dnl # autoconf 2.50 and later -dnl # AC_SYS_LARGEFILE - -PACKAGE=freeradius +dnl Compile in large (2G+) file support. +AC_SYS_LARGEFILE dnl # check for system bytesex dnl # AC_DEFINES WORDS_BIGENDIAN @@ -74,19 +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) @@ -115,7 +125,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) ;; @@ -129,6 +139,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' @@ -208,7 +221,7 @@ AC_ARG_WITH(ascend-binary, esac ] ) if test "X$ASCEND_BINARY" = "Xyes"; then - AC_DEFINE(ASCEND_BINARY) + AC_DEFINE(ASCEND_BINARY, [], [Include support for Ascend binary filter attributes]) fi dnl extra argument: --with-threads @@ -223,25 +236,27 @@ 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-large-files -rad_enable_largefiles=no -AC_ARG_WITH(large-files, -[ --with-large-files Compile in large (2G+) file support. (default=no)], +dnl extra argument: --with-dhcp +AC_ARG_WITH(dhcp, +[ --with-dhcp Compile in DHCP support. (default=no)], [ case "$withval" in yes) - rad_enable_largefiles=yes + AC_DEFINE(WITH_DHCP, [1], [Include experimental support for DHCP]) ;; *) ;; @@ -288,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, @@ -300,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 # @@ -384,14 +418,9 @@ AC_ARG_WITH(udpfromto, ) if test "x$WITH_UDPFROMTO" = "xyes"; then - AC_DEFINE(WITH_UDPFROMTO) + AC_DEFINE(WITH_UDPFROMTO, [], [define if you want udpfromto]) fi -dnl extra argument: --with-edir -dnl If using Novell eDirectory, enable UP and Novell specific code -AC_ARG_WITH(edir, -[ --with-edir Enable Novell eDirectory integration. (default=no) ] , [] ) - dnl ############################################################# dnl # dnl # 1. Checks for programs @@ -433,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" ], @@ -457,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" @@ -472,8 +501,9 @@ else dnl # HP/UX requires linking with librt, too, to get the sem_* symbols. dnl # Some systems have them in -lsem dnl # Solaris has them in -lposix4 + dnl # NetBSD has them in -lsemaphore - AC_SEARCH_LIBS(sem_init, pthread sem posix4 rt, + AC_SEARCH_LIBS(sem_init, pthread sem posix4 rt semaphore, [], [AC_MSG_ERROR(-lsem not found. You may want to download it from ftp://ftp.to.gd-es.com/pub/BSDI/libsem.tar.bz2 or ftp://ftp.freeradius.org/pub/radius/contrib/libsem.tar.gz)] ) @@ -492,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, @@ -510,7 +543,22 @@ 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= +AC_CHECK_LIB(pcap, pcap_open_live, + [ PCAP_LIBS="-lpcap" + AC_DEFINE(HAVE_LIBPCAP, 1, + [Define to 1 if you have the `pcap' library (-lpcap).]) + ], + [ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ]) + +AC_LIB_READLINE dnl ############################################################# dnl # @@ -521,14 +569,15 @@ dnl ############################################################# dnl # dnl # Interix requires us to set -D_ALL_SOURCE, otherwise dnl # getopt will be #included, but won't link. -dnl # -dnl # +dnl # +dnl # case "$host" in *-interix*) CFLAGS="$CFLAGS -D_ALL_SOURCE" ;; *-darwin*) CFLAGS="$CFLAGS -DDARWIN" + LIBS="-framework DirectoryService $LIBS" ;; esac @@ -542,6 +591,7 @@ AC_CHECK_HEADERS( \ crypt.h \ errno.h \ resource.h \ + sys/resource.h \ getopt.h \ malloc.h \ utmp.h \ @@ -558,20 +608,31 @@ 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 \ - sys/stat.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)) +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 REGEX_EXTENDED=no REGEX=yes @@ -580,7 +641,7 @@ if test "x$ac_cv_header_regex_h" = "xyes"; then #ifdef REG_EXTENDED yes #endif - ], [AC_DEFINE(HAVE_REG_EXTENDED) REGEX_EXTENDED=yes]) + ], [AC_DEFINE(HAVE_REG_EXTENDED, [], [define this if we have REG_EXTENDED (from )]) REGEX_EXTENDED=yes]) fi AC_SUBST(REGEX) AC_SUBST(REGEX_EXTENDED) @@ -590,19 +651,20 @@ dnl # other checks which require headers dnl # if test "x$ac_cv_header_sys_security_h" = "xyes" && test "x$ac_cv_header_prot_h" = "xyes" then - AC_DEFINE(OSFC2) + AC_DEFINE(OSFC2, [], [define if you have OSFC2 authentication]) fi if test "x$ac_cv_header_sia_h" = "xyes" && test "x$ac_cv_header_siad_h" = "xyes" then - AC_DEFINE(OSFSIA) + AC_DEFINE(OSFSIA, [], [define if you have OSFSIA authentication]) fi dnl Check for OpenSSL includes. OPENSSL_INCLUDE="-DNO_OPENSSL" -if test "x$OPENSSL_LIBS" = "x"; then - AC_MSG_WARN([skipping test for openssl/ssl.h]) -else +if test "x$WITH_OPENSSL" = xyes; then + if test "x$OPENSSL_LIBS" = "x"; then + AC_MSG_NOTICE([skipping test for openssl/ssl.h]) + else old_CPPFLAGS=$CPPFLAGS if test "x$OPENSSL_INCLUDE_DIR" != "x"; then CPPFLAGS="$CPPFLAGS -I$OPENSSL_INCLUDE_DIR" @@ -613,6 +675,7 @@ else openssl/ssl.h \ openssl/crypto.h \ openssl/err.h \ + openssl/evp.h \ openssl/engine.h, [], OPENSSL_LIBS= @@ -638,11 +701,34 @@ else fi fi CPPFLAGS=$old_CPPFLAGS + fi fi AC_SUBST(OPENSSL_INCLUDE) AC_SUBST(OPENSSL_LIBS) export OPENSSL_LIBS +dnl Check the pcap includes for the RADIUS sniffer. +if test "x$PCAP_LIBS" = x; then + AC_MSG_NOTICE([skipping test for pcap.h.]) +else + AC_CHECK_HEADER(pcap.h, + AC_DEFINE(HAVE_PCAP_H, 1, + [Define to 1 if you have the header file.]), + [ 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) + dnl ############################################################# dnl # dnl # 4. Checks for typedefs @@ -652,50 +738,83 @@ 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 dnl check for socklen_t -AC_CHECK_TYPE_INCLUDE([ +FR_CHECK_TYPE_INCLUDE([ #ifdef HAVE_SYS_TYPES_H #include #endif #ifdef HAVE_SYS_SOCKET_H #include #endif -],socklen_t, int) +],socklen_t, int, [socklen_t is generally 'int' on systems which don't use it]) dnl check for uint8_t -AC_CHECK_TYPE_INCLUDE([ +FR_CHECK_TYPE_INCLUDE([ #ifdef HAVE_INTTYPES_H #include #endif #ifdef HAVE_STDINT_H #include #endif -],uint8_t, unsigned char) +],uint8_t, unsigned char, [uint8_t should be the canonical 'octet' for network traffic]) dnl check for uint16_t -AC_CHECK_TYPE_INCLUDE([ +FR_CHECK_TYPE_INCLUDE([ #ifdef HAVE_INTTYPES_H #include #endif #ifdef HAVE_STDINT_H #include #endif -],uint16_t, unsigned short) +],uint16_t, unsigned short, [uint16_t should be the canonical '2 octets' for network traffic]) dnl check for uint32_t -AC_CHECK_TYPE_INCLUDE([ +FR_CHECK_TYPE_INCLUDE([ #ifdef HAVE_INTTYPES_H #include #endif #ifdef HAVE_STDINT_H #include #endif -],uint32_t, unsigned int) +],uint32_t, unsigned int, [uint32_t should be the canonical 'network integer]) + +AC_CHECK_TYPE(struct in6_addr, AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, [IPv6 address structure]), [], [ +#ifdef HAVE_NETINET_IN_H +#include +#endif +]) + +AC_CHECK_TYPE(struct sockaddr_storage, AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Generic socket addresses]), [], [ +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +]) + +AC_CHECK_TYPE(struct sockaddr_in6, AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1, [IPv6 socket addresses]), [], [ +#ifdef HAVE_NETINET_IN_H +#include +#endif +]) + +AC_CHECK_TYPE(struct addrinfo, AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [Generic DNS lookups]), [], [ +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETDB_H +#include +#endif +]) dnl ############################################################# dnl # @@ -721,19 +840,26 @@ AC_CHECK_FUNCS( \ inet_aton \ inet_pton \ inet_ntop \ - gethostname \ setlinebuf \ setvbuf \ getusershell \ initgroups \ - closefrom + getaddrinfo \ + getnameinfo \ + closefrom \ + gettimeofday \ + getpeereid \ + setuid \ + setresuid \ + getresuid \ + strlcat \ + strlcpy ) RADIUSD_NEED_DECLARATIONS( \ crypt \ strncasecmp \ strcasecmp \ inet_aton \ - gethostname \ setlinebuf \ getusershell \ endusershell @@ -746,18 +872,25 @@ dnl # if so, check if struct utmpx has entry ut_xtime dnl # if not, set it to define ut_xtime == ut_tv.tv_sec if test "x$ac_cv_header_utmpx_h" = "xyes" then - AC_CHECK_STRUCT_HAS_MEMBER([#include ], [struct utmpx], ut_xtime) + FR_CHECK_STRUCT_HAS_MEMBER([#include ], [struct utmpx], ut_xtime) if test "x$ac_cv_type_struct_utmpx_has_ut_xtime" = "x" then - AC_DEFINE(ut_xtime,ut_tv.tv_sec) + AC_DEFINE(ut_xtime,ut_tv.tv_sec, [define to something if you don't have ut_xtime in struct utmpx]) fi fi dnl # struct ip_pktinfo -AC_CHECK_STRUCT_HAS_MEMBER([#include ], [struct in_pktinfo], ipi_addr) +FR_CHECK_STRUCT_HAS_MEMBER([#include ], [struct in_pktinfo], ipi_addr) if test "x$ac_cv_type_struct_in_pktinfo_has_ipi_addr" = "xyes" then - AC_DEFINE(HAVE_IP_PKTINFO) + AC_DEFINE(HAVE_IP_PKTINFO, [], [define if you have IP_PKTINFO (Linux)]) +fi + +dnl # struct in6_pktinfo +FR_CHECK_STRUCT_HAS_MEMBER([#include ], [struct in6_pktinfo], ipi6_addr) +if test "x$ac_cv_type_struct_in6_pktinfo_has_ipi6_addr" = "xyes" +then + AC_DEFINE(HAVE_IN6_PKTINFO, [], [define if you have IN6_PKTINFO (Linux)]) fi dnl ############################################################# @@ -769,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 @@ -800,25 +933,32 @@ 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, CRYPTLIB="-lcrypt" ) if test "$CRYPTLIB" != ""; then - AC_DEFINE(HAVE_CRYPT) + AC_DEFINE(HAVE_CRYPT, [], [Do we have the crypt function]) else - AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT)) + AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT, [], [Do we have the crypt function])) fi dnl Check for libcipher @@ -827,14 +967,13 @@ 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]) dnl SYSV (_r six args) +AC_DEFINE(SYSVSTYLE, [2], [SYSV-Style get*byaddr_r]) dnl BSD (three args, may not be thread safe) +AC_DEFINE(BSDSTYLE, [3], [BSD-Style get*byaddr_r]) dnl Tru64 has BSD version, but it is thread safe dnl http://h30097.www3.hp.com/docs/base_doc/DOCUMENTATION/V51B_HTML/MAN/MAN3/1739____.HTM dnl We need #stdio.h to define NULL on FreeBSD (at least) @@ -842,9 +981,20 @@ gethostbyaddrrstyle="" AC_MSG_CHECKING([gethostbyaddr_r() syntax]) case "$host" in *-freebsd*) - AC_DEFINE(GETHOSTBYADDRRSTYLE, BSDSTYLE) - 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 @@ -852,7 +1002,7 @@ if test "x$gethostbyaddrrstyle" = "x"; then #include #include ], [ gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL) ], [ - AC_DEFINE(GETHOSTBYADDRRSTYLE, GNUSTYLE) + AC_DEFINE(GETHOSTBYADDRRSTYLE, GNUSTYLE, [style of gethostbyaddr_r functions ]) gethostbyaddrrstyle=GNU ]) fi @@ -861,7 +1011,7 @@ if test "x$gethostbyaddrrstyle" = "x"; then #include #include ], [ gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL) ] , [ - AC_DEFINE(GETHOSTBYADDRRSTYLE, SYSVSTYLE) + AC_DEFINE(GETHOSTBYADDRRSTYLE, SYSVSTYLE, [style of gethostbyaddr_r functions ]) gethostbyaddrrstyle=SYSV ]) fi @@ -870,7 +1020,7 @@ if test "x$gethostbyaddrrstyle" = "x"; then #include #include ], [ gethostbyaddr(NULL, 0, 0) ], [ - AC_DEFINE(GETHOSTBYADDRRSTYLE, BSDSTYLE) + AC_DEFINE(GETHOSTBYADDRRSTYLE, BSDSTYLE, [style of gethostbyaddr_r functions ]) gethostbyaddrrstyle=BSD ]) fi @@ -898,7 +1048,7 @@ AC_TRY_LINK([ #include #include ], [ gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL) ], [ - AC_DEFINE(GETHOSTBYNAMERSTYLE, GNUSTYLE) + AC_DEFINE(GETHOSTBYNAMERSTYLE, GNUSTYLE, [style of gethostbyname_r functions ]) gethostbynamerstyle=GNU ]) if test "x$gethostbynamerstyle" = "x"; then @@ -906,7 +1056,7 @@ if test "x$gethostbynamerstyle" = "x"; then #include #include ], [ gethostbyname_r(NULL, NULL, NULL, 0, NULL) ] , [ - AC_DEFINE(GETHOSTBYNAMERSTYLE, SYSVSTYLE) + AC_DEFINE(GETHOSTBYNAMERSTYLE, SYSVSTYLE, [style of gethostbyname_r functions ]) gethostbynamerstyle=SYSV ]) fi @@ -915,7 +1065,7 @@ if test "x$gethostbynamerstyle" = "x"; then #include #include ], [ gethostbyname(NULL) ], [ - AC_DEFINE(GETHOSTBYNAMERSTYLE, BSDSTYLE) + AC_DEFINE(GETHOSTBYNAMERSTYLE, BSDSTYLE, [style of gethostbyname_r functions ]) gethostbynamerstyle=BSD ]) fi @@ -931,19 +1081,21 @@ if test "x$gethostbynamerstyle" = "xBSD"; then fi dnl check for non-posix solaris ctime_r (extra buflen int arg) +AC_DEFINE(POSIXSTYLE, [1], [Posix-Style ctime_r]) +AC_DEFINE(SOLARISSTYLE, [2], [Solaris-Style ctime_r]) ctimerstyle="" AC_MSG_CHECKING([ctime_r() syntax]) AC_TRY_LINK([ #include ], [ ctime_r(NULL, NULL, 0) ], [ - AC_DEFINE(CTIMERSTYLE, SOLARISSTYLE) + AC_DEFINE(CTIMERSTYLE, SOLARISSTYLE, [style of ctime_r function]) ctimerstyle="SOLARIS" ]) if test "x$ctimerstyle" = "x"; then AC_TRY_LINK([ #include ], [ ctime_r(NULL, NULL) ], [ - AC_DEFINE(CTIMERSTYLE, POSIXSTYLE) + AC_DEFINE(CTIMERSTYLE, POSIXSTYLE, [style of ctime_r function]) ctimerstyle="POSIX" ]) fi @@ -954,64 +1106,6 @@ else AC_MSG_RESULT([${ctimerstyle}-style]) fi - -dnl If configuring with large file support, determine the right flags to -dnl use based on the platform. This is the wrong approach; autoconf 2.50 -dnl comes with a macro that takes the right approach. But this works well -dnl enough until we switch to autoconf 2.50 or later. -if test x"$rad_enable_largefiles" = xyes ; then - AC_MSG_CHECKING(for largefile linkage) - case "$host" in - *-aix4.[01]*) - AC_MSG_RESULT(no) - AC_MSG_ERROR([AIX before 4.2 does not support large files]) - ;; - *-aix4*) - AC_MSG_RESULT(ok) - LFS_CFLAGS="-D_LARGE_FILES" - LFS_LDFLAGS="" - LFS_LIBS="" - ;; - *-hpux*) - AC_MSG_RESULT(ok) - LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - LFS_LDFLAGS="" - LFS_LIBS="" - ;; - *-irix*) - AC_MSG_RESULT(no) - AC_MSG_ERROR([Large files not supported on this platform]) - ;; - *-linux*) - AC_MSG_RESULT(maybe) - LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - LFS_LDFLAGS="" - LFS_LIBS="" - AC_DEFINE([_GNU_SOURCE], 1, - [Some versions of glibc need this defined for pread/pwrite.]) - ;; - *-solaris*) - AC_MSG_RESULT(ok) - AC_PATH_PROG(GETCONF, getconf) - if test -z "$GETCONF" ; then - AC_MSG_ERROR([getconf required to configure large file support]) - fi - LFS_CFLAGS=`$GETCONF LFS_CFLAGS` - LFS_LDFLAGS=`$GETCONF LFS_LDFLAGS` - LFS_LIBS=`$GETCONF LFS_LIBS` - ;; - *) - AC_MSG_RESULT(maybe) - LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - LFS_LDFLAGS="" - LFS_LIBS="" - ;; - esac - AC_SUBST(LFS_CFLAGS) - AC_SUBST(LFS_LDFLAGS) - AC_SUBST(LFS_LIBS) -fi - AC_SUBST(HOSTINFO, $host) dnl ############################################################# @@ -1038,17 +1132,17 @@ dnl # Configure in any module directories. dnl # dnl ############################################################# -mysubdirs= +mysubdirs="$LIBLTDLPATH" if test "x$EXPERIMENTAL" = "xyes"; then - bar=`ls -1 src/modules/rlm_*/configure | sed 's%/configure%%'` + bar=`ls -1 "${srcdir}"/src/modules/rlm_*/configure | sed 's%/configure%%'` dnl # get rid of LF's. - mysubdirs=`echo $bar` + mysubdirs=`echo $mysubdirs $bar` else - dnl # + dnl # dnl # Find 'configure' in ONLY the stable modules - dnl # - for bar in `cat src/modules/stable`; do - if test -f src/modules/$bar/configure; then + dnl # + for bar in `cat "${srcdir}"/src/modules/stable`; do + if test -f "${srcdir}"/src/modules/$bar/configure; then mysubdirs="$mysubdirs src/modules/$bar" fi done @@ -1058,14 +1152,14 @@ dnl ############################################################ dnl # make modules by list dnl ############################################################# if test "x$EXPERIMENTAL" = "xyes"; then - for foo in `ls -1 src/modules | grep rlm_`; do + for foo in `ls -1 "${srcdir}"/src/modules | grep rlm_`; do MODULES="$MODULES $foo" done else dnl # dnl # make ONLY the stable modules dnl # - for foo in `cat src/modules/stable`; do + for foo in `cat "${srcdir}"/src/modules/stable`; do MODULES="$MODULES $foo" done fi @@ -1083,6 +1177,11 @@ dnl # And finally, output the results. dnl # 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 radiusd.cron.daily radiusd.cron.monthly cryptpasswd)]) + dnl # dnl # Substitute whatever libraries we found to be necessary dnl # @@ -1097,7 +1196,6 @@ AC_SUBST(STATIC_MODULES) AC_SUBST(RADIUSD_MAJOR_VERSION) AC_SUBST(RADIUSD_MINOR_VERSION) AC_SUBST(RADIUSD_VERSION) -export CFLAGS LIBS AC_OUTPUT(\ ./Make.inc \ @@ -1108,15 +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/radrelay.conf \ ./raddb/radiusd.conf ) - -AC_OUTPUT_COMMANDS([echo timestamp > src/include/stamp-h]) -AC_OUTPUT_COMMANDS([(cd ./src/include && /bin/sh ./build-radpaths-h)]) -AC_OUTPUT_COMMANDS([(cd ./src/main && chmod +x checkrad.pl radlast radtest)]) -AC_OUTPUT_COMMANDS([(cd ./scripts && chmod +x rc.radiusd radwatch check-radiusd-config radiusd.cron.daily radiusd.cron.monthly cryptpasswd)])