updated (but need regen)

diff --git a/client/Makefile.am b/client/Makefile.am
index 85645af80d412ec3bac0e28edd5286d0bc57b0f3..1c604f6a833c3fa2432a8c74b8724413239223e9 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,14 +4,16 @@
 # production code. Sadly, we are not there yet.
 SUBDIRS = . tests
 
+BINDLIBDIR = @BINDDIR@/lib
+
 dist_sysconf_DATA = dhclient.conf.example
 sbin_PROGRAMS = dhclient
 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
                   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
                   scripts/netbsd scripts/nextstep scripts/openbsd \
                   scripts/solaris scripts/openwrt
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
-                ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+                $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
 EXTRA_DIST = $(man_MANS)
 

diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
index a16d5891d5821ee64a023edbed071415a9b49e8c..c07c504a943a38a930d8aad0956d684dc93be4ce 100644 (file)
--- a/client/tests/Makefile.am
+++ b/client/tests/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = .
 
+BINDLIBDIR = @BINDDIR@/lib
+
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
 AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
@@ -16,9 +18,9 @@ info:
 DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c
 
 DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
-          $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \
-         $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \
-         $(top_builddir)/bind/lib/libisc.a
+          $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+         $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
+         $(BINDLIBDIR)/libisc.a
 
 ATF_TESTS =
 if HAVE_ATF

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 32e055c1d659a856a6e561249fb120f41fe4fd16..34748feadba1bed57ac2897484f32cf8d8f40da7 100644 (file)
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = .
 
+BINDLIBDIR = @BINDDIR@/lib
+
 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
 
 EXTRA_DIST = Atffile
@@ -13,26 +15,26 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest
 alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
 alloc_unittest_LDADD = $(ATF_LDFLAGS)
 alloc_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-       ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
+       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
 
 dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
 dns_unittest_LDADD = $(ATF_LDFLAGS)
 dns_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-       ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
+       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
 
 misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
 misc_unittest_LDADD = $(ATF_LDFLAGS)
 misc_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-       ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
+       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
 
 ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
 ns_name_unittest_LDADD = $(ATF_LDFLAGS)
 ns_name_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-       ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
+       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
 
 check: $(ATF_TESTS)
        sh ${top_srcdir}/tests/unittest.sh

diff --git a/configure.ac b/configure.ac
index 9f81078d4711d0c42df49f15f29df8484a25cc65..a5937ac814bcfdcae93bdb7c441b1bebc6a68f1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -595,25 +595,32 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.tp_vlan_tci,
     [AC_DEFINE([VLAN_TCI_PRESENT], [1], [tpacket_auxdata.tp_vlan_tci present])]
     ,, [#include <linux/if_packet.h>])
 
-libbind=
+BINDDIR=
 AC_ARG_WITH(libbind,
        AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH 
                        (default is ./bind)]),
        use_libbind="$withval", use_libbind="no")
 case "$use_libbind" in 
 yes)
-       libbind="\${top_srcdir}/bind"
+       BINDDIR="\${top_srcdir}/bind"
        ;;
 no)
-       libbind="\${top_srcdir}/bind"
+       BINDDIR="\${top_srcdir}/bind"
        ;;
 *)
-       libbind="$use_libbind"
+       BINDDIR="$use_libbind"
        if test ! -d "bind"; then
-               AC_MSG_WARN(empty bind directory)
-       fi      
+               # no bind directory, create it with a fake Makefile.in
+               mkdir bind
+               cat > bind/Makefile.in << EOF
+# placeholder
+all check clean distclean distdir install uninstall:
+
+EOF
+       fi
        ;;
 esac
+AC_SUBST(BINDDIR)
 
 # OpenLDAP support.
 AC_ARG_WITH(ldap,
@@ -648,7 +655,7 @@ fi
 CFLAGS="$CFLAGS $STD_CWARNINGS"
 
 # Try to add the bind include directory
-CFLAGS="$CFLAGS -I$libbind/include"
+CFLAGS="$CFLAGS -I$BINDDIR/include"
 
 case "$host" in
 *-darwin*)

diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
index dfa470957c90e9dd5fa2d9763c775a323759dbc5..ceb0de12ffa9c0f204746ccc9a2ddacbde91a0c1 100644 (file)
--- a/dhcpctl/Makefile.am
+++ b/dhcpctl/Makefile.am
@@ -1,3 +1,5 @@
+BINDLIBDIR = @BINDDIR@/lib
+
 bin_PROGRAMS = omshell
 lib_LIBRARIES = libdhcpctl.a
 noinst_PROGRAMS = cltest
@@ -6,12 +8,12 @@ EXTRA_DIST = $(man_MANS)
 
 omshell_SOURCES = omshell.c
 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-               ../bind/lib/libirs.a ../bind/lib/libdns.a \
-               ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+               $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 
 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
 
 cltest_SOURCES = cltest.c
 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-              ../bind/lib/libirs.a ../bind/lib/libdns.a \
-               ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+              $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a

diff --git a/omapip/Makefile.am b/omapip/Makefile.am
index 8237de0e96db4ce86f5bcf8bab257356c4595f8c..446a594162fbbb741b2f49f1d841414af04a29cb 100644 (file)
--- a/omapip/Makefile.am
+++ b/omapip/Makefile.am
@@ -1,3 +1,5 @@
+BINDLIBDIR = @BINDDIR@/lib
+
 lib_LIBRARIES = libomapi.a
 noinst_PROGRAMS = svtest
 
@@ -10,6 +12,6 @@ man_MANS = omapi.3
 EXTRA_DIST = $(man_MANS)
 
 svtest_SOURCES = test.c
-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
-               ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 

diff --git a/relay/Makefile.am b/relay/Makefile.am
index 198d5cd651114a792debed3550e1edcdb7e3b6f3..3060eca4b172323ecffaf1f4fcd9936a8554bd54 100644 (file)
--- a/relay/Makefile.am
+++ b/relay/Makefile.am
@@ -1,10 +1,12 @@
+BINDLIBDIR = @BINDDIR@/lib
+
 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
 
 sbin_PROGRAMS = dhcrelay
 dhcrelay_SOURCES = dhcrelay.c
 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-                ../bind/lib/libirs.a ../bind/lib/libdns.a \
-                ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+                $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+                $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 man_MANS = dhcrelay.8
 EXTRA_DIST = $(man_MANS)
 

diff --git a/server/Makefile.am b/server/Makefile.am
index 8e8ce889b535480c5d69a0f666778292dfc0ec46..2fe560723cd794d0dffab1a1bcfb3f4365280b5b 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -4,6 +4,8 @@
 # production code. Sadly, we are not there yet.
 SUBDIRS = . tests
 
+BINDLIBDIR = @BINDDIR@/lib
+
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
 
 dist_sysconf_DATA = dhcpd.conf.example
@@ -14,8 +16,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
 
 dhcpd_CFLAGS = $(LDAP_CFLAGS)
 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-             ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
-             ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+             ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+             $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
+             $(BINDLIBDIR)/libisc.a
 
 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 EXTRA_DIST = $(man_MANS)

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index fb345c54c4a1861c2ae660da471c99c801a4a671..1d176af074433a925cc2bfb2a84d763a2d379400 100644 (file)
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = .
 
+BINDLIBDIR = @BINDDIR@/lib
+
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
 AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
@@ -17,10 +19,10 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
           ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
           ../ldap.c ../ldap_casa.c ../dhcpd.c
 
-DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
-          $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \
-         $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \
-         $(top_builddir)/bind/lib/libisc.a
+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
+          $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+         $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
+         $(BINDLIBDIR)/libisc.a
 
 ATF_TESTS =
 if HAVE_ATF