X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=configure.ac;h=c7ad192245404eb6f97f0799d83d4b5e311a982b;hb=f6b8f48d1665c4487dedbcfa4dca435a0d67ddeb;hp=e3a29922a89b4e62cd38d853c927a685d81e08c8;hpb=6b87c7f213bea62a545169286acdd5d2b66ae082;p=thirdparty%2Fdhcp.git

diff --git a/configure.ac b/configure.ac
index e3a29922a..c7ad19224 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.2],[dhcp-users@isc.org])
 
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
@@ -184,6 +184,9 @@ AC_ARG_ENABLE(relay-port,
 if test "$enable_relay_port" = "yes"; then
 	AC_DEFINE([RELAY_PORT], [1],
 		  [Define to 1 to include relay port support.])
+else
+	# so we can report below
+	enable_relay_port="no"
 fi
 
 # PARANOIA is off by default (until we can test it with all features)
@@ -246,24 +249,15 @@ fi
 
 # Testing section
 
+# Bind Makefile needs to know ATF is not included.
+AM_CONDITIONAL(BIND_ATF, test "foo" = "barr")
+
 DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 AC_ARG_WITH([atf],
-    AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed (or "bind")]),
+    AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed]),
     [atf_path="$withval"])
-AM_CONDITIONAL(BIND_ATF, test "$atf_path" = "bind")
-if test "$atf_path" = "bind" ; then
-    DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=bind"
-    atf_pcp="bind"
-    atf_path="\${top_srcdir}/bind/atf"
-    ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST"
-    ATF_LDFLAGS="-L$atf_path/lib -latf-c"
-    ATF_BIN=`cd $srcdir; pwd`/bind/atf/bin
-    AC_SUBST(ATF_CFLAGS)
-    AC_SUBST(ATF_LDFLAGS)
-    AC_SUBST(ATF_BIN)
-    BINDCONFIG="$BINDCONFIG --with-atf"
-elif test "$atf_path" != "no" ; then
+if test "$atf_path" != "no" ; then
     DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
     # Config path for pkg-config
     atf_pcp=""
@@ -635,7 +629,7 @@ if test "$have_nanosleep" = "rt"; then
 	LIBS="-lrt $LIBS"
 fi
 
-# check for /dev/random (declares HAVE_DEV_RANDOM)
+# check for /dev/random (declares ISC_PATH_RANDOMDEV)
 AC_MSG_CHECKING(for random device)
 AC_ARG_WITH(randomdev,
 	AS_HELP_STRING([--with-randomdev=PATH],[Path for random device
@@ -659,8 +653,8 @@ else
 	else
 		AC_MSG_RESULT($use_randomdev)
 		AC_CHECK_FILE($use_randomdev,
-		    AC_DEFINE([HAVE_DEV_RANDOM], [1], 
-			[Define to 1 if you have the /dev/random or other configured file.]),
+		    AC_DEFINE_UNQUOTED([ISC_PATH_RANDOMDEV], ["$use_randomdev"], 
+			[Define if you have the /dev/random or other configured file.]),
 		    AC_MSG_ERROR(cannot find $use_randomdev))
 	fi
 	BINDCONFIG="$BINDCONFIG --with-randomdev=$use_randomdev"
@@ -1006,9 +1000,11 @@ AC_CONFIG_FILES([
   dhcpctl/Makefile.am
   dhcpctl/Makefile
   includes/Makefile
+  keama/Makefile
   omapip/Makefile.am
   omapip/Makefile
   relay/Makefile
+  relay/tests/Makefile
   server/Makefile
   tests/Makefile.am
   tests/Makefile