dhcp/patches/dhcp-4.2.5-sharedlib.patch

   1 diff -up dhcp-4.2.5b1/client/Makefile.am.sharedlib dhcp-4.2.5b1/client/Makefile.am
   2 --- dhcp-4.2.5b1/client/Makefile.am.sharedlib   2012-12-17 16:26:53.350623790 +0100
   3 +++ dhcp-4.2.5b1/client/Makefile.am     2012-12-17 16:26:53.384623342 +0100
   4 @@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
   5                    scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
   6                    scripts/netbsd scripts/nextstep scripts/openbsd \
   7                    scripts/solaris scripts/openwrt
   8 -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
   9 +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
  10                  $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
  11  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  12  EXTRA_DIST = $(man_MANS)
  13 diff -up dhcp-4.2.5b1/common/tests/Makefile.am.sharedlib dhcp-4.2.5b1/common/tests/Makefile.am
  14 --- dhcp-4.2.5b1/common/tests/Makefile.am.sharedlib     2012-12-17 16:26:53.271624835 +0100
  15 +++ dhcp-4.2.5b1/common/tests/Makefile.am       2012-12-17 16:26:53.384623342 +0100
  16 @@ -13,7 +13,7 @@ ATF_TESTS += alloc_unittest
  17  alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
  18  alloc_unittest_LDADD = $(ATF_LDFLAGS)
  19  alloc_unittest_LDADD += ../libdhcp.a  \
  20 -       ../../omapip/libomapi.a \
  21 +       ../../omapip/libomapi.la \
  22          $(BIND9_LIBDIR) -ldns-export -lisc-export
  23
  24  check: $(ATF_TESTS)
  25 diff -up dhcp-4.2.5b1/configure.ac.sharedlib dhcp-4.2.5b1/configure.ac
  26 --- dhcp-4.2.5b1/configure.ac.sharedlib 2012-12-17 16:26:53.350623790 +0100
  27 +++ dhcp-4.2.5b1/configure.ac   2012-12-17 16:26:53.384623342 +0100
  28 @@ -37,7 +37,8 @@ fi
  29  # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
  30  AC_USE_SYSTEM_EXTENSIONS
  31
  32 -AC_PROG_RANLIB
  33 +# Use libtool to simplify building of shared libraries
  34 +AC_PROG_LIBTOOL
  35  AC_CONFIG_HEADERS([includes/config.h])
  36
  37  # we sometimes need to know byte order for building packets
  38 diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.sharedlib dhcp-4.2.5b1/dhcpctl/Makefile.am
  39 --- dhcp-4.2.5b1/dhcpctl/Makefile.am.sharedlib  2012-12-17 16:26:53.271624835 +0100
  40 +++ dhcp-4.2.5b1/dhcpctl/Makefile.am    2012-12-17 16:26:53.385623329 +0100
  41 @@ -1,15 +1,15 @@
  42  bin_PROGRAMS = omshell
  43 -lib_LIBRARIES = libdhcpctl.a
  44 +lib_LTLIBRARIES = libdhcpctl.la
  45  noinst_PROGRAMS = cltest
  46  man_MANS = omshell.1 dhcpctl.3
  47  EXTRA_DIST = $(man_MANS)
  48
  49  omshell_SOURCES = omshell.c
  50 -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  51 +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
  52                 $(BIND9_LIBDIR) -ldns-export -lisc-export
  53
  54 -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  55 +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
  56
  57  cltest_SOURCES = cltest.c
  58 -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  59 +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
  60                $(BIND9_LIBDIR) -ldns-export -lisc-export
  61 diff -up dhcp-4.2.5b1/omapip/Makefile.am.sharedlib dhcp-4.2.5b1/omapip/Makefile.am
  62 --- dhcp-4.2.5b1/omapip/Makefile.am.sharedlib   2012-12-17 16:26:53.272624822 +0100
  63 +++ dhcp-4.2.5b1/omapip/Makefile.am     2012-12-17 16:26:53.385623329 +0100
  64 @@ -1,7 +1,7 @@
  65 -lib_LIBRARIES = libomapi.a
  66 +lib_LTLIBRARIES = libomapi.la
  67  noinst_PROGRAMS = svtest
  68
  69 -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  70 +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  71                      errwarn.c listener.c dispatch.c generic.c support.c \
  72                      handle.c message.c convert.c hash.c auth.c inet_addr.c \
  73                      array.c trace.c toisc.c iscprint.c isclib.c
  74 @@ -10,5 +10,5 @@ man_MANS = omapi.3
  75  EXTRA_DIST = $(man_MANS)
  76
  77  svtest_SOURCES = test.c
  78 -svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
  79 +svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
  80
  81 diff -up dhcp-4.2.5b1/relay/Makefile.am.sharedlib dhcp-4.2.5b1/relay/Makefile.am
  82 --- dhcp-4.2.5b1/relay/Makefile.am.sharedlib    2012-12-17 16:26:53.351623777 +0100
  83 +++ dhcp-4.2.5b1/relay/Makefile.am      2012-12-17 16:26:53.385623329 +0100
  84 @@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
  85
  86  sbin_PROGRAMS = dhcrelay
  87  dhcrelay_SOURCES = dhcrelay.c
  88 -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
  89 +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
  90                  $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
  91  man_MANS = dhcrelay.8
  92  EXTRA_DIST = $(man_MANS)
  93 diff -up dhcp-4.2.5b1/server/Makefile.am.sharedlib dhcp-4.2.5b1/server/Makefile.am
  94 --- dhcp-4.2.5b1/server/Makefile.am.sharedlib   2012-12-17 16:26:53.272624822 +0100
  95 +++ dhcp-4.2.5b1/server/Makefile.am     2012-12-17 16:26:53.385623329 +0100
  96 @@ -13,8 +13,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
  97                 dhcpv6.c mdb6.c ldap.c ldap_casa.c
  98
  99  dhcpd_CFLAGS = $(LDAP_CFLAGS)
 100 -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 101 -             ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 102 +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
 103 +             ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
 104
 105  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 106  EXTRA_DIST = $(man_MANS)
 107 diff -up dhcp-4.2.5b1/server/tests/Makefile.am.sharedlib dhcp-4.2.5b1/server/tests/Makefile.am
 108 --- dhcp-4.2.5b1/server/tests/Makefile.am.sharedlib     2012-12-17 16:26:53.000000000 +0100
 109 +++ dhcp-4.2.5b1/server/tests/Makefile.am       2012-12-17 16:28:25.898349545 +0100
 110 @@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
 111            ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
 112            ../ldap.c ../ldap_casa.c ../dhcpd.c
 113
 114 -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
 115 -          $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 116 +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la    \
 117 +          $(top_builddir)/dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
 118
 119  ATF_TESTS =
 120  TESTS =