From: Tomasz Mrugalski <tomasz@isc.org>
Date: Tue, 14 Aug 2012 13:00:01 +0000 (+0000)
Subject: [rt25901_atf] autoreconf --install
X-Git-Tag: v4_3_0a1~77^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b483f01af4288c4be28ee06ba254435c954716e;p=thirdparty%2Fdhcp.git

[rt25901_atf] autoreconf --install
---

diff --git a/common/Makefile.in b/common/Makefile.in
index d705b22e4..3f990a768 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -184,6 +184,11 @@ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
 
 man_MANS = dhcp-eval.5 dhcp-options.5
 EXTRA_DIST = $(man_MANS)
+
+# We want to build this directory first, before descending into tests subdir.
+# The reason is that ideally the tests should link existing objects from this
+# directory. That eliminates any discrepancies between tested code and
+# production code. Sadly, we are not there yet.
 SUBDIRS = . tests
 all: all-recursive
 
diff --git a/configure b/configure
index c7f8f6d64..b3868dacb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for DHCP 4.2.0-git.
+# Generated by GNU Autoconf 2.67 for DHCP 4.2.0.
 #
 # Report bugs to <dhcp-users@isc.org>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='DHCP'
 PACKAGE_TARNAME='dhcp'
-PACKAGE_VERSION='4.2.0-git'
-PACKAGE_STRING='DHCP 4.2.0-git'
+PACKAGE_VERSION='4.2.0'
+PACKAGE_STRING='DHCP 4.2.0'
 PACKAGE_BUGREPORT='dhcp-users@isc.org'
 PACKAGE_URL=''
 
@@ -1267,7 +1267,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.0-git to adapt to many kinds of systems.
+\`configure' configures DHCP 4.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1333,7 +1333,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of DHCP 4.2.0-git:";;
+     short | recursive ) echo "Configuration of DHCP 4.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1477,7 +1477,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-DHCP configure 4.2.0-git
+DHCP configure 4.2.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2195,7 +2195,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.0-git, which was
+It was created by DHCP $as_me 4.2.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2884,7 +2884,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dhcp'
- VERSION='4.2.0-git'
+ VERSION='4.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6815,7 +6815,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.2.0-git, which was
+This file was extended by DHCP $as_me 4.2.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6881,7 +6881,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.2.0-git
+DHCP config.status 4.2.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/server/Makefile.in b/server/Makefile.in
index 3743b1b80..ba0167de2 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -188,6 +188,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+
+# We want to build this directory first, before descending into tests subdir.
+# The reason is that ideally the tests should link existing objects from this
+# directory. That eliminates any discrepancies between tested code and
+# production code. Sadly, we are not there yet.
 SUBDIRS = . tests
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
 dist_sysconf_DATA = dhcpd.conf