autoconf regeneration

diff --git a/configure b/configure
index 7f6daa6f9ff08abeccb722b4df7e68337bfa129c..5702c45178b0df715ceef6589b7ff0fa319a4364 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for DHCP 4.2.0a2.
+# Generated by GNU Autoconf 2.62 for DHCP 4.2.0b1.
 #
 # Report bugs to <dhcp-users@isc.org>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='DHCP'
 PACKAGE_TARNAME='dhcp'
-PACKAGE_VERSION='4.2.0a2'
-PACKAGE_STRING='DHCP 4.2.0a2'
+PACKAGE_VERSION='4.2.0b1'
+PACKAGE_STRING='DHCP 4.2.0b1'
 PACKAGE_BUGREPORT='dhcp-users@isc.org'
 
 # Factoring default headers for most tests.
@@ -716,6 +716,7 @@ EGREP
 RANLIB
 byte_order
 ac_prefix_program
+LDAP_CFLAGS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -740,6 +741,8 @@ with_cli_pid_file
 with_cli6_pid_file
 with_relay_pid_file
 with_libbind
+with_ldap
+with_ldapcrypto
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1302,7 +1305,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.2.0a2 to adapt to many kinds of systems.
+\`configure' configures DHCP 4.2.0b1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1371,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of DHCP 4.2.0a2:";;
+     short | recursive ) echo "Configuration of DHCP 4.2.0b1:";;
    esac
   cat <<\_ACEOF
 
@@ -1423,6 +1426,9 @@ Optional Packages:
                           LOCALSTATEDIR/run/dhcrelay.pid)
   --with-libbind=PATH     bind includes and libraries are in PATH (default is
                           ./bind)
+  --with-ldap             enable OpenLDAP support in dhcpd (default is no)
+  --with-ldapcrypto       enable OpenLDAP crypto support in dhcpd (default is
+                          no)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1500,7 +1506,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-DHCP configure 4.2.0a2
+DHCP configure 4.2.0b1
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1514,7 +1520,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.2.0a2, which was
+It was created by DHCP $as_me 4.2.0b1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2211,7 +2217,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dhcp'
- VERSION='4.2.0a2'
+ VERSION='4.2.0b1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8571,6 +8577,133 @@ no)
        ;;
 esac
 
+# OpenLDAP support.
+
+# Check whether --with-ldap was given.
+if test "${with_ldap+set}" = set; then
+  withval=$with_ldap; ldap=$withval
+else
+  ldap=no
+fi
+
+
+# OpenLDAP with SSL support.
+
+# Check whether --with-ldapcrypto was given.
+if test "${with_ldapcrypto+set}" = set; then
+  withval=$with_ldapcrypto; ldapcrypto=$withval
+else
+  ldapcrypto=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
+    { $as_echo "$as_me:$LINENO: checking for library containing ldap_initialize" >&5
+$as_echo_n "checking for library containing ldap_initialize... " >&6; }
+if test "${ac_cv_search_ldap_initialize+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* 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 ldap_initialize ();
+int
+main ()
+{
+return ldap_initialize ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ldap; 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
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_ldap_initialize=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_ldap_initialize+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_ldap_initialize+set}" = set; then
+  :
+else
+  ac_cv_search_ldap_initialize=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ldap_initialize" >&5
+$as_echo "$ac_cv_search_ldap_initialize" >&6; }
+ac_res=$ac_cv_search_ldap_initialize
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { { $as_echo "$as_me:$LINENO: error: *** Cannot find ldap_initialize with -lldap - do you need to install an OpenLDAP2 Devel package?
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: *** Cannot find ldap_initialize with -lldap - do you need to install an OpenLDAP2 Devel package?
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+    if test x$ldapcrypto = xyes ; then
+       LDAP_CFLAGS="-DLDAP_CONFIGURATION -DLDAP_USE_SSL"
+
+    else
+       LDAP_CFLAGS="-DLDAP_CONFIGURATION"
+
+    fi
+fi
+
 # Append selected warning levels to CFLAGS before substitution (but after
 # AC_TRY_COMPILE & etc).
 CFLAGS="$CFLAGS $STD_CWARNINGS"
@@ -9085,7 +9218,7 @@ exec 6>&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.2.0a2, which was
+This file was extended by DHCP $as_me 4.2.0b1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9138,7 +9271,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-DHCP config.status 4.2.0a2
+DHCP config.status 4.2.0b1
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"