--- embedaddon/dhcp/configure	2012/02/21 22:30:18	1.1
+++ embedaddon/dhcp/configure	2012/10/09 09:06:54	1.1.1.1
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for DHCP 4.1-ESV-R4.
+# Generated by GNU Autoconf 2.61 for DHCP 4.1-ESV-R7.
 #
 # Report bugs to <dhcp-users@isc.org>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='DHCP'
 PACKAGE_TARNAME='dhcp'
-PACKAGE_VERSION='4.1-ESV-R4'
-PACKAGE_STRING='DHCP 4.1-ESV-R4'
+PACKAGE_VERSION='4.1-ESV-R7'
+PACKAGE_STRING='DHCP 4.1-ESV-R7'
 PACKAGE_BUGREPORT='dhcp-users@isc.org'
 
 # Factoring default headers for most tests.
@@ -697,6 +697,10 @@ GREP
 EGREP
 RANLIB
 byte_order
+ATF_CFLAGS
+ATF_LDFLAGS
+HAVE_ATF_TRUE
+HAVE_ATF_FALSE
 ac_prefix_program
 LIBOBJS
 LTLIBOBJS'
@@ -1212,7 +1216,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.1-ESV-R4 to adapt to many kinds of systems.
+\`configure' configures DHCP 4.1-ESV-R7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1278,7 +1282,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of DHCP 4.1-ESV-R4:";;
+     short | recursive ) echo "Configuration of DHCP 4.1-ESV-R7:";;
    esac
   cat <<\_ACEOF
 
@@ -1308,6 +1312,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-atf=PATH         specify location where atf was installed
   --with-srv-lease-file=PATH
                           File for dhcpd leases (default is
                           LOCALSTATEDIR/db/dhcpd.leases)
@@ -1413,7 +1418,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-DHCP configure 4.1-ESV-R4
+DHCP configure 4.1-ESV-R7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1427,7 +1432,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.1-ESV-R4, which was
+It was created by DHCP $as_me 4.1-ESV-R7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2120,7 +2125,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dhcp'
- VERSION='4.1-ESV-R4'
+ VERSION='4.1-ESV-R7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4653,7 +4658,9 @@ _ACEOF
 # Optional compile-time DEBUGging.
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
+  enableval=$enable_debug; enable_debug=yes
+else
+  enable_debug=no
 fi
 
 # This is very much off by default.
@@ -4793,9 +4800,9 @@ _ACEOF
 
 fi
 
-# Check whether --enable-IPv4_PKTINFO was given.
-if test "${enable_IPv4_PKTINFO+set}" = set; then
-  enableval=$enable_IPv4_PKTINFO;
+# Check whether --enable-ipv4_pktinfo was given.
+if test "${enable_ipv4_pktinfo+set}" = set; then
+  enableval=$enable_ipv4_pktinfo;
 fi
 
 
@@ -4807,9 +4814,9 @@ _ACEOF
 
 fi
 
-# Check whether --enable-USE_SOCKETS was given.
-if test "${enable_USE_SOCKETS+set}" = set; then
-  enableval=$enable_USE_SOCKETS;
+# Check whether --enable-use_sockets was given.
+if test "${enable_use_sockets+set}" = set; then
+  enableval=$enable_use_sockets;
 fi
 
 
@@ -4821,6 +4828,55 @@ _ACEOF
 
 fi
 
+# Testing section
+
+atf_path="no"
+
+# Check whether --with-atf was given.
+if test "${with_atf+set}" = set; then
+  withval=$with_atf; atf_path="$withval"
+fi
+
+if test "$atf_path" != "no" ; then
+    # Config path for pkg-config
+    atf_pcp=""
+    if test "$atf_path" != "yes" ; then
+        if test -f $atf_path/lib/pkgconfig/atf-c.pc ; then
+            atf_pcp=$atf_path/lib/pkgconfig
+        fi
+    else
+        # Not specified, try some common paths
+        atf_dirs="/usr /usr/local /usr/pkg /opt /opt/local"
+        for d in $atf_dirs
+        do
+            if test -f $d/lib/pkgconfig/atf-c.pc ; then
+                atf_pcp=$d/lib/pkgconfig
+            fi
+        done
+    fi
+    if test "$atf_pcp" = "" ; then
+        { { echo "$as_me:$LINENO: error: Unable to find atf files in location specified" >&5
+echo "$as_me: error: Unable to find atf files in location specified" >&2;}
+   { (exit 1); exit 1; }; }
+    else
+        ATF_CFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --cflags atf-c` -DUNIT_TEST"
+        ATF_LDFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --libs atf-c`"
+
+
+    fi
+fi
+
+ if test "$atf_pcp" != ""; then
+  HAVE_ATF_TRUE=
+  HAVE_ATF_FALSE='#'
+else
+  HAVE_ATF_TRUE='#'
+  HAVE_ATF_FALSE=
+fi
+
+### Uncomment this once docs.lab.isc.org upgrades to automake 1.11
+### AM_COND_IF([HAVE_ATF], [AC_DEFINE([HAVE_ATF], [1], [ATF framework specified?])])
+
 ###
 ### Path fun.  Older versions of DHCP were installed in /usr/sbin, so we
 ### need to look there and potentially overwrite by default (but not if
@@ -6790,7 +6846,7 @@ fi
 		then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_BPF ""
+#define HAVE_BPF 1
 _ACEOF
 
 		fi
@@ -6968,6 +7024,65 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
+#
+# check for GCC noreturn attribute
+#
+{ echo "$as_me:$LINENO: checking for GCC noreturn attribute" >&5
+echo $ECHO_N "checking for GCC noreturn attribute... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+void foo() __attribute__((noreturn));
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define ISC_DHCP_NORETURN __attribute__((noreturn))
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define ISC_DHCP_NORETURN
+_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 # Look for optional headers.
 
 
@@ -8113,7 +8228,7 @@ _ACEOF
 
 
 
-# Solaris does not have the msg_control or msg_controlen members in
+# Solaris does not have the msg_control or msg_controlen members
 # in the msghdr structure unless you define:
 #
 #   _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED, and __EXTENSIONS__
@@ -8421,7 +8536,7 @@ _ACEOF
   fi
 
 
-ac_config_files="$ac_config_files Makefile client/Makefile common/Makefile common/tests/Makefile dhcpctl/Makefile dst/Makefile includes/Makefile minires/Makefile omapip/Makefile relay/Makefile server/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile client/Makefile common/Makefile common/tests/Makefile dhcpctl/Makefile dst/Makefile includes/Makefile minires/Makefile omapip/Makefile relay/Makefile server/Makefile tests/Makefile server/tests/Makefile doc/devel/doxyfile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8540,6 +8655,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_ATF_TRUE}" && test -z "${HAVE_ATF_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ATF\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_ATF\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -8840,7 +8962,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.1-ESV-R4, which was
+This file was extended by DHCP $as_me 4.1-ESV-R7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8893,7 +9015,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-DHCP config.status 4.1-ESV-R4
+DHCP config.status 4.1-ESV-R7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -9021,6 +9143,8 @@ do
     "relay/Makefile") CONFIG_FILES="$CONFIG_FILES relay/Makefile" ;;
     "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "server/tests/Makefile") CONFIG_FILES="$CONFIG_FILES server/tests/Makefile" ;;
+    "doc/devel/doxyfile") CONFIG_FILES="$CONFIG_FILES doc/devel/doxyfile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -9166,12 +9290,16 @@ GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 RANLIB!$RANLIB$ac_delim
 byte_order!$byte_order$ac_delim
+ATF_CFLAGS!$ATF_CFLAGS$ac_delim
+ATF_LDFLAGS!$ATF_LDFLAGS$ac_delim
+HAVE_ATF_TRUE!$HAVE_ATF_TRUE$ac_delim
+HAVE_ATF_FALSE!$HAVE_ATF_FALSE$ac_delim
 ac_prefix_program!$ac_prefix_program$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -9733,3 +9861,41 @@ if test "$no_create" != yes; then
 fi
 
 
+cat > config.report << END
+
+     ISC DHCP source configure results:
+    -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+Package:
+  Name:          $PACKAGE_NAME
+  Version:       $PACKAGE_VERSION
+
+C Compiler:      $CC
+
+Flags:
+  DEFS:          $DEFS
+  CFLAGS:        $CFLAGS
+
+Features:
+  debug:         $enable_debug
+  failover:      $enable_failover
+  execute:       $enable_execute
+
+Developer:
+  ATF unittests : $atf_path
+
+END
+# TODO: Add Perl system tests
+
+if test "$atf_path" != "no"
+then
+echo "ATF_CFLAGS  : $ATF_CFLAGS" >> config.report
+echo "ATF_LDFLAGS : $ATF_LDFLAGS" >> config.report
+echo
+fi
+
+cat config.report
+
+echo
+echo Now you can type "make" to build ISC DHCP
+echo