diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 211 |
1 files changed, 195 insertions, 16 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for DHCP 4.3.2. +# Generated by GNU Autoconf 2.69 for DHCP 4.3.3. # # Report bugs to <dhcp-users@isc.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='DHCP' PACKAGE_TARNAME='dhcp' -PACKAGE_VERSION='4.3.2' -PACKAGE_STRING='DHCP 4.3.2' +PACKAGE_VERSION='4.3.3' +PACKAGE_STRING='DHCP 4.3.3' PACKAGE_BUGREPORT='dhcp-users@isc.org' PACKAGE_URL='' @@ -626,6 +626,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS LDAP_CFLAGS +LDAP_LIBS BINDDIR ac_prefix_program HAVE_ATF_FALSE @@ -752,6 +753,7 @@ enable_ipv4_pktinfo enable_use_sockets enable_secs_byteorder enable_log_pid +enable_binary_leases with_atf with_srv_lease_file with_srv6_lease_file @@ -766,6 +768,8 @@ with_relay6_pid_file with_libbind with_ldap with_ldapcrypto +with_ldap_gssapi +with_ldapcasa ' ac_precious_vars='build_alias host_alias @@ -1316,7 +1320,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures DHCP 4.3.2 to adapt to many kinds of systems. +\`configure' configures DHCP 4.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1386,7 +1390,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DHCP 4.3.2:";; + short | recursive ) echo "Configuration of DHCP 4.3.3:";; esac cat <<\_ACEOF @@ -1421,6 +1425,8 @@ Optional Features: --enable-secs-byteorder Correct bad byteorders in the secs field (default is no). --enable-log-pid Include PIDs in syslog messages (default is no). + --enable-binary-leases enable support for binary insertion of leases + (default is no) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1461,6 +1467,10 @@ Optional Packages: --with-ldap enable OpenLDAP support in dhcpd (default is no) --with-ldapcrypto enable OpenLDAP crypto support in dhcpd (default is no) + --with-ldap-gssapi enable krb5/gssapi authentication for OpenLDAP in + dhcpd (default is no) + --with-ldapcasa enable LDAP CASA auth support in dhcpd (default is + no) Some influential environment variables: CC C compiler command @@ -1538,7 +1548,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DHCP configure 4.3.2 +DHCP configure 4.3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2331,7 +2341,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by DHCP $as_me 4.3.2, which was +It was created by DHCP $as_me 4.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3197,7 +3207,7 @@ fi # Define the identity of the package. PACKAGE='dhcp' - VERSION='4.3.2' + VERSION='4.3.3' cat >>confdefs.h <<_ACEOF @@ -5291,6 +5301,7 @@ fi # Failover is on by default, so define if it is not explicitly disabled. if test "$enable_failover" != "no"; then + enable_failover="yes" $as_echo "#define FAILOVER_PROTOCOL 1" >>confdefs.h @@ -5304,6 +5315,7 @@ fi # execute() is on by default, so define if it is not explicitly disabled. if test "$enable_execute" != "no" ; then + enable_execute="yes" $as_echo "#define ENABLE_EXECUTE 1" >>confdefs.h @@ -5332,6 +5344,8 @@ if test "$enable_delayed_ack" = "yes"; then $as_echo "#define DELAYED_ACK 1" >>confdefs.h +else + enable_delayed_ack="no" fi # DHCPv6 optional compile-time feature. @@ -5342,6 +5356,7 @@ fi # DHCPv6 is on by default, so define if it is not explicitly disabled. if test "$enable_dhcpv6" != "no"; then + enable_dhcpv6="yes" $as_echo "#define DHCPv6 1" >>confdefs.h @@ -5428,6 +5443,21 @@ $as_echo "#define USE_LOG_PID 1" >>confdefs.h fi +# Allow for binary search when inserting v4 leases into queues +# Check whether --enable-binary_leases was given. +if test "${enable_binary_leases+set}" = set; then : + enableval=$enable_binary_leases; +fi + +# binary_leases is off by default. +if test "$enable_binary_leases" = "yes"; then + +$as_echo "#define BINARY_LEASES 1" >>confdefs.h + +else + enable_binary_leases="no" +fi + # Testing section atf_path="no" @@ -6668,10 +6698,34 @@ else fi +# Gssapi to allow LDAP to authenticate with a keytab + +# Check whether --with-ldap-gssapi was given. +if test "${with_ldap_gssapi+set}" = set; then : + withval=$with_ldap_gssapi; ldap_gssapi=$withval +else + ldap_gssapi=no +fi + + + +# LDAP CASA auth support. + +# Check whether --with-ldapcasa was given. +if test "${with_ldapcasa+set}" = set; then : + withval=$with_ldapcasa; ldapcasa=$withval +else + ldapcasa=no +fi + + # OpenLDAP support is disabled by default, if enabled then SSL support is an # extra optional that is also disabled by default. Enabling LDAP SSL support -# implies enabling LDAP support. -if test x$ldap = xyes || test x$ldapcrypto = xyes ; then +# implies enabling LDAP support. Similarly, KRB5 support implies LDAP support, +# but doesn't include SSL. The two are not dependant. +if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes; then + saved_LIBS="$LIBS" + LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_initialize" >&5 $as_echo_n "checking for library containing ldap_initialize... " >&6; } if ${ac_cv_search_ldap_initialize+:} false; then : @@ -6794,14 +6848,136 @@ as_fn_error $? "*** Cannot find ber_pvt_opt_on with -llber - do you need to inst See \`config.log' for more details" "$LINENO" 5; } fi + if test x$ldap_gssapi = xyes ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing krb5_init_context" >&5 +$as_echo_n "checking for library containing krb5_init_context... " >&6; } +if ${ac_cv_search_krb5_init_context+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - if test x$ldapcrypto = xyes ; then - LDAP_CFLAGS="-DLDAP_CONFIGURATION -DLDAP_USE_SSL" +/* 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 krb5_init_context (); +int +main () +{ +return krb5_init_context (); + ; + return 0; +} +_ACEOF +for ac_lib in '' krb5; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_krb5_init_context=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_krb5_init_context+:} false; then : + break +fi +done +if ${ac_cv_search_krb5_init_context+:} false; then : - else - LDAP_CFLAGS="-DLDAP_CONFIGURATION" +else + ac_cv_search_krb5_init_context=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_krb5_init_context" >&5 +$as_echo "$ac_cv_search_krb5_init_context" >&6; } +ac_res=$ac_cv_search_krb5_init_context +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "*** Cannot find krb5_init_context with -lkrb5 - do you need to install a Kerberos Devel package? +See \`config.log' for more details" "$LINENO" 5; } +fi + + fi + + # Create LDAP_LIBS which we specify them explicitly rather than lumping them in with LIBS + LDAP_LIBS=$LIBS + + LIBS="$saved_LIBS" + + + for ac_header in ldap.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" +if test "x$ac_cv_header_ldap_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LDAP_H 1 +_ACEOF + +fi + +done + + for ac_func in inet_pton inet_ntop +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + LDAP_CFLAGS="-DLDAP_CONFIGURATION" + + if test x$ldapcasa = xyes ; then + for ac_header in micasa_mgmd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "micasa_mgmd.h" "ac_cv_header_micasa_mgmd_h" "$ac_includes_default" +if test "x$ac_cv_header_micasa_mgmd_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MICASA_MGMD_H 1 +_ACEOF + + LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_CASA_AUTH" + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "*** Cannot find micasa_mgmd.h for ldap casa auth support +See \`config.log' for more details" "$LINENO" 5; } +fi + +done fi + + if test x$ldapcrypto = xyes ; then + LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_USE_SSL" + fi + + if test x$ldap_gssapi = xyes; then + LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_USE_GSSAPI" + fi + + LDAP_CFLAGS=$LDAP_CFLAGS + fi # Append selected warning levels to CFLAGS before substitution (but after @@ -7404,7 +7580,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DHCP $as_me 4.3.2, which was +This file was extended by DHCP $as_me 4.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7470,7 +7646,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DHCP config.status 4.3.2 +DHCP config.status 4.3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -8325,6 +8501,9 @@ Features: debug: $enable_debug failover: $enable_failover execute: $enable_execute + binary-leases: $enable_binary_leases + dhcpv6: $enable_dhcpv6 + delayed-ack: $enable_delayed_ack Developer: ATF unittests : $atf_path |