src/patches/dhcp-4.2.2-remove-bind.patch

   1 diff -up dhcp-4.2.2/client/Makefile.am.rh637017 dhcp-4.2.2/client/Makefile.am
   2 --- dhcp-4.2.2/client/Makefile.am.rh637017      2010-09-15 00:32:36.000000000 +0200
   3 +++ dhcp-4.2.2/client/Makefile.am       2011-08-11 17:28:58.923897561 +0200
   4 @@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
   5                    scripts/netbsd scripts/nextstep scripts/openbsd \
   6                    scripts/solaris scripts/openwrt
   7  dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
   8 -                ../bind/lib/libdns.a ../bind/lib/libisc.a
   9 +                $(BIND9_LIBDIR) -ldns-export -lisc-export
  10  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  11  EXTRA_DIST = $(man_MANS)
  12
  13 diff -up dhcp-4.2.2/common/tests/Makefile.am.rh637017 dhcp-4.2.2/common/tests/Makefile.am
  14 --- dhcp-4.2.2/common/tests/Makefile.am.rh637017        2009-10-28 05:12:30.000000000 +0100
  15 +++ dhcp-4.2.2/common/tests/Makefile.am 2011-08-11 17:33:45.258637236 +0200
  16 @@ -6,6 +6,5 @@ TESTS = test_alloc
  17
  18  test_alloc_SOURCES = test_alloc.c
  19  test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
  20 -       ../../omapip/libomapi.a ../../bind/lib/libdns.a \
  21 -        ../../bind/lib/libisc.a
  22 -
  23 +       ../../omapip/libomapi.a \
  24 +        $(BIND9_LIBDIR) -ldns-export -lisc-export
  25 diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
  26 --- dhcp-4.2.2/configure.ac.rh637017    2011-07-20 02:32:18.000000000 +0200
  27 +++ dhcp-4.2.2/configure.ac     2011-08-11 17:28:58.924897535 +0200
  28 @@ -512,20 +512,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
  29  libbind=
  30  AC_ARG_WITH(libbind,
  31         AC_HELP_STRING([--with-libbind=PATH],
  32 -                      [bind includes and libraries are in PATH
  33 -                       (default is ./bind)]),
  34 +                      [bind includes are in PATH
  35 +                       (default is ./bind/includes)]),
  36         use_libbind="$withval", use_libbind="no")
  37  case "$use_libbind" in
  38 +yes|no)
  39 +       libbind="\${top_srcdir}/bind/include"
  40 +       ;;
  41 +*)
  42 +       libbind="$use_libbind"
  43 +       ;;
  44 +esac
  45 +
  46 +BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
  47 +AC_ARG_WITH(libbind-libs,
  48 +       AC_HELP_STRING([--with-libbind-libs=PATH],
  49 +                      [bind9 export libraries are in PATH]),
  50 +                      [libbind_libs="$withval"], [libbind_libs='no'])
  51 +case "$libbind_libs" in
  52  yes)
  53 -       libbind="\${top_srcdir}/bind"
  54 +       AC_MSG_ERROR([Specify path to bind9 libraries])
  55         ;;
  56  no)
  57 -       libbind="\${top_srcdir}/bind"
  58 +       BUNDLED_BIND=yes
  59         ;;
  60  *)
  61 -       libbind="$use_libbind"
  62 +       BIND9_LIBDIR="-L$libbind_libs"
  63 +       BUNDLED_BIND=no
  64         ;;
  65  esac
  66 +AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
  67 +AC_SUBST([BIND9_LIBDIR])
  68
  69  # OpenLDAP support.
  70  AC_ARG_WITH(ldap,
  71 @@ -562,7 +579,7 @@ fi
  72  CFLAGS="$CFLAGS $STD_CWARNINGS"
  73
  74  # Try to add the bind include directory
  75 -CFLAGS="$CFLAGS -I$libbind/include"
  76 +CFLAGS="$CFLAGS -I$libbind"
  77
  78  AC_C_FLEXIBLE_ARRAY_MEMBER
  79
  80 diff -up dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 dhcp-4.2.2/dhcpctl/Makefile.am
  81 --- dhcp-4.2.2/dhcpctl/Makefile.am.rh637017     2009-10-28 05:12:30.000000000 +0100
  82 +++ dhcp-4.2.2/dhcpctl/Makefile.am      2011-08-11 17:28:58.924897535 +0200
  83 @@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
  84
  85  omshell_SOURCES = omshell.c
  86  omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  87 -               ../bind/lib/libdns.a ../bind/lib/libisc.a
  88 +               $(BIND9_LIBDIR) -ldns-export -lisc-export
  89
  90  libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  91
  92  cltest_SOURCES = cltest.c
  93  cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  94 -              ../bind/lib/libdns.a ../bind/lib/libisc.a
  95 \ No newline at end of file
  96 +              $(BIND9_LIBDIR) -ldns-export -lisc-export
  97 diff -up dhcp-4.2.2/Makefile.am.rh637017 dhcp-4.2.2/Makefile.am
  98 --- dhcp-4.2.2/Makefile.am.rh637017     2010-03-25 00:30:38.000000000 +0100
  99 +++ dhcp-4.2.2/Makefile.am      2011-08-11 17:28:58.925897509 +0200
 100 @@ -21,7 +21,13 @@ EXTRA_DIST = RELNOTES LICENSE \
 101              util/bindvar.sh \
 102              bind/Makefile bind/bind.tar.gz bind/version.tmp
 103
 104 -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
 105 +if BUNDLED_BIND
 106 +SUBDIRS = bind
 107 +else
 108 +SUBDIRS =
 109 +endif
 110 +
 111 +SUBDIRS += includes tests common dst omapip client dhcpctl relay server
 112
 113  nobase_include_HEADERS = dhcpctl/dhcpctl.h
 114
 115 diff -up dhcp-4.2.2/omapip/Makefile.am.rh637017 dhcp-4.2.2/omapip/Makefile.am
 116 --- dhcp-4.2.2/omapip/Makefile.am.rh637017      2010-02-12 01:13:54.000000000 +0100
 117 +++ dhcp-4.2.2/omapip/Makefile.am       2011-08-11 17:28:58.939897149 +0200
 118 @@ -10,5 +10,5 @@ man_MANS = omapi.3
 119  EXTRA_DIST = $(man_MANS)
 120
 121  svtest_SOURCES = test.c
 122 -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
 123 +svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 124
 125 diff -up dhcp-4.2.2/relay/Makefile.am.rh637017 dhcp-4.2.2/relay/Makefile.am
 126 --- dhcp-4.2.2/relay/Makefile.am.rh637017       2009-10-28 05:12:30.000000000 +0100
 127 +++ dhcp-4.2.2/relay/Makefile.am        2011-08-11 17:28:58.940897123 +0200
 128 @@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
 129  sbin_PROGRAMS = dhcrelay
 130  dhcrelay_SOURCES = dhcrelay.c
 131  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 132 -                ../bind/lib/libdns.a ../bind/lib/libisc.a
 133 +                $(BIND9_LIBDIR) -ldns-export -lisc-export
 134  man_MANS = dhcrelay.8
 135  EXTRA_DIST = $(man_MANS)
 136
 137 diff -up dhcp-4.2.2/server/Makefile.am.rh637017 dhcp-4.2.2/server/Makefile.am
 138 --- dhcp-4.2.2/server/Makefile.am.rh637017      2010-03-24 22:49:47.000000000 +0100
 139 +++ dhcp-4.2.2/server/Makefile.am       2011-08-11 17:28:58.944897021 +0200
 140 @@ -8,8 +8,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
 141
 142  dhcpd_CFLAGS = $(LDAP_CFLAGS)
 143  dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 144 -             ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
 145 -             ../bind/lib/libisc.a
 146 +             ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 147
 148  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 149  EXTRA_DIST = $(man_MANS)