src/patches/dhcp/dhcp-sharedlib.patch

   1 diff -up dhcp-4.3.1b1/common/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/common/tests/Makefile.am
   2 --- dhcp-4.3.1b1/common/tests/Makefile.am.uCWMBl        2014-07-10 17:38:10.779828569 +0200
   3 +++ dhcp-4.3.1b1/common/tests/Makefile.am       2014-07-10 17:38:21.355678580 +0200
   4 @@ -13,19 +13,19 @@ ATF_TESTS += alloc_unittest dns_unittest
   5  alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
   6  alloc_unittest_LDADD = $(ATF_LDFLAGS)
   7  alloc_unittest_LDADD += ../libdhcp.a  \
   8 -       ../../omapip/libomapi.a \
   9 +       ../../omapip/libomapi.la \
  10         $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  11
  12  dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
  13  dns_unittest_LDADD = $(ATF_LDFLAGS)
  14 -dns_unittest_LDADD += ../libdhcp.a  \
  15 +dns_unittest_LDADD += ../libdhcp.la  \
  16         ../../omapip/libomapi.a \
  17         $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  18
  19  misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
  20  misc_unittest_LDADD = $(ATF_LDFLAGS)
  21  misc_unittest_LDADD += ../libdhcp.a  \
  22 -       ../../omapip/libomapi.a \
  23 +       ../../omapip/libomapi.la \
  24         $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  25  check: $(ATF_TESTS)
  26         atf-run | atf-report
  27 diff -up dhcp-4.3.1b1/configure.ac.uCWMBl dhcp-4.3.1b1/configure.ac
  28 --- dhcp-4.3.1b1/configure.ac.uCWMBl    2014-07-10 17:38:10.766828753 +0200
  29 +++ dhcp-4.3.1b1/configure.ac   2014-07-10 17:38:10.779828569 +0200
  30 @@ -39,7 +39,8 @@ fi
  31  # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
  32  AC_USE_SYSTEM_EXTENSIONS
  33
  34 -AC_PROG_RANLIB
  35 +# Use libtool to simplify building of shared libraries
  36 +AC_PROG_LIBTOOL
  37  AC_CONFIG_HEADERS([includes/config.h])
  38
  39  # we sometimes need to know byte order for building packets
  40 diff -up dhcp-4.3.1b1/dhcpctl/Makefile.am.uCWMBl dhcp-4.3.1b1/dhcpctl/Makefile.am
  41 --- dhcp-4.3.1b1/dhcpctl/Makefile.am.uCWMBl     2014-07-10 17:36:30.485250962 +0200
  42 +++ dhcp-4.3.1b1/dhcpctl/Makefile.am    2014-07-10 17:38:10.780828554 +0200
  43 @@ -1,14 +1,14 @@
  44  bin_PROGRAMS = omshell
  45 -lib_LIBRARIES = libdhcpctl.a
  46 +lib_LTLIBRARIES = libdhcpctl.la
  47  noinst_PROGRAMS = cltest
  48  man_MANS = omshell.1 dhcpctl.3
  49  EXTRA_DIST = $(man_MANS)
  50
  51  omshell_SOURCES = omshell.c
  52 -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  53 +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
  54                 $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  55 -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  56 +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
  57
  58  cltest_SOURCES = cltest.c
  59 -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  60 +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
  61                $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  62 diff -up dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl dhcp-4.3.1b1/omapip/Makefile.am
  63 --- dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl      2014-07-10 17:36:30.486250948 +0200
  64 +++ dhcp-4.3.1b1/omapip/Makefile.am     2014-07-10 17:38:10.780828554 +0200
  65 @@ -1,7 +1,7 @@
  66 -lib_LIBRARIES = libomapi.a
  67 +lib_LTLIBRARIES = libomapi.la
  68  noinst_PROGRAMS = svtest
  69
  70 -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  71 +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  72                      errwarn.c listener.c dispatch.c generic.c support.c \
  73                      handle.c message.c convert.c hash.c auth.c inet_addr.c \
  74                      array.c trace.c toisc.c iscprint.c isclib.c
  75 @@ -10,5 +10,5 @@ man_MANS = omapi.3
  76  EXTRA_DIST = $(man_MANS)
  77
  78  svtest_SOURCES = test.c
  79 -svtest_LDADD = libomapi.a \
  80 +svtest_LDADD = libomapi.la \
  81                $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  82 diff -up dhcp-4.3.1b1/server/Makefile.am.uCWMBl dhcp-4.3.1b1/server/Makefile.am
  83 --- dhcp-4.3.1b1/server/Makefile.am.uCWMBl      2014-07-10 17:36:30.486250948 +0200
  84 +++ dhcp-4.3.1b1/server/Makefile.am     2014-07-10 17:38:10.780828554 +0200
  85 @@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
  86                 dhcpv6.c mdb6.c ldap.c ldap_casa.c
  87
  88  dhcpd_CFLAGS = $(LDAP_CFLAGS)
  89 -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
  90 +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \
  91               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
  92  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  93  EXTRA_DIST = $(man_MANS)
  94 diff -up dhcp-4.3.1b1/server/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/server/tests/Makefile.am
  95 --- dhcp-4.3.1b1/server/tests/Makefile.am.uCWMBl        2014-07-10 17:36:30.486250948 +0200
  96 +++ dhcp-4.3.1b1/server/tests/Makefile.am       2014-07-10 17:38:10.780828554 +0200
  97 @@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
  98            ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
  99            ../ldap.c ../ldap_casa.c ../dhcpd.c
 100
 101 -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
 102 -          $(top_builddir)/dhcpctl/libdhcpctl.a \
 103 +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
 104 +          $(top_builddir)/dhcpctl/libdhcpctl.la \
 105            $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
 106
 107  ATF_TESTS =