Half fixed recovering (no space handling) (unfinished)

diff --git a/common/Makefile.am.in b/common/Makefile.am.in
index b168a0bae1e7b9e00b4a57f3adc28428e48c97d9..f403f0f36b49fc5919b63591468f5463d712de00 100644 (file)
--- a/common/Makefile.am.in
+++ b/common/Makefile.am.in
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
 AM_CFLAGS = $(LDAP_CFLAGS)
 
-noinst_LIBRARIES = libdhcp.@A@
+lib_@DHLIBS@ = libdhcp.@A@
 libdhcp_@A@_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \
                      discover.c dispatch.c dlpi.c dns.c ethernet.c execute.c \
                      fddi.c icmp.c inet.c lpf.c memory.c nit.c ns_name.c \

diff --git a/configure b/configure
index 8442d5e2b89be6210831c35c79a67aa07df2c8f5..c3a7a24f176781d5b4f184eae0f11a0289128906 100755 (executable)
--- a/configure
+++ b/configure
@@ -629,6 +629,7 @@ LDAP_CFLAGS
 LDAP_LIBS
 BINDLT
 A
+DHLIBS
 INSTALL_BIND_FALSE
 INSTALL_BIND_TRUE
 HAVE_BINDDIR_FALSE
@@ -7032,23 +7033,29 @@ if test "${enable_libtool+set}" = set; then :
   enableval=$enable_libtool; want_libtool="$enableval"
 fi
 
-if test "$want_libtool" = "yes"; then
+
+
 if test "$want_libtool" = "yes"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&5
 $as_echo "$as_me: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&5
-$as_echo "$as_me: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&2;}
-       cd $srcdir; exec ./re-conf $ac_configure_args
-       cd $srcdir; exec ./re-conf $ac_configure_args
-       as_fn_error $? "Recovering failed" "$LINENO" 5
+       # dequote $ac_configure_args
+       eval "set my_configure_args $ac_configure_args"
+       shift
+       re_configure_args=
+       for a; do
+               re_configure_args="$re_configure_args $a"
+       done
+       cd $srcdir; exec ./re-conf $re_configure_args
        as_fn_error $? "Recovering failed" "$LINENO" 5
 fi
-fi
-A=a
+
+DHLIBS=LIBRARIES
 A=a
 
 
 
+
+
 # OpenLDAP support.
 
 # Check whether --with-ldap was given.

diff --git a/configure.ac b/configure.ac
index 338879b4660d4b4e3d30c4cfbba178f31a5153c1..abd8ab617db858b9c72f8a88968a271c6ee53560 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -825,18 +825,25 @@ BINDLT=
 AC_ARG_ENABLE(libtool,
        AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
        want_libtool="$enableval")
-if test "$want_libtool" = "yes"; then
+
+
 if test "$want_libtool" = "yes"; then
        AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
-       AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
-       cd $srcdir; exec ./re-conf $ac_configure_args
-       cd $srcdir; exec ./re-conf $ac_configure_args
-       AC_MSG_ERROR([Recovering failed])
+       # dequote $ac_configure_args
+       eval "set my_configure_args $ac_configure_args"
+       shift
+       re_configure_args=
+       for a; do
+               re_configure_args="$re_configure_args $a"
+       done
+       cd $srcdir; exec ./re-conf $re_configure_args
        AC_MSG_ERROR([Recovering failed])
 fi
-fi
-A=a
+
+DHLIBS=LIBRARIES
 A=a
+
+AC_SUBST(DHLIBS)
 AC_SUBST(A)
 AC_SUBST(BINDLT)
 

diff --git a/configure.ac+lt b/configure.ac+lt
index c64738fb58cdc5f370a201c3b3e6ba9eb928fea4..dccf2f66782d5712e03e17cd940222852f9b4c73 100644 (file)
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -62,7 +62,6 @@ AC_SUBST(BINDCONFIG)
 # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
 AC_USE_SYSTEM_EXTENSIONS
 
-AC_PROG_RANLIB
 
 AC_PATH_PROG(AR, ar)
 AC_SUBST(AR)
@@ -829,11 +828,17 @@ BINDLT=
 AC_ARG_ENABLE(libtool,
        AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
        want_libtool="$enableval")
+
 if test "$want_libtool" = "no"; then
        AC_MSG_ERROR([libtool configure is used but libtool is disabled?])
 fi
+
+DHLIBS=LTLIBRARIES
 A=la
 BINDLT=--with-libtool
+
+
+AC_SUBST(DHLIBS)
 AC_SUBST(A)
 AC_SUBST(BINDLT)
 

diff --git a/configure.ac-base b/configure.ac-base
index d973fd4a2ee061531b4d49df58ec30ea9fd436c5..4b109ced93aa1bb907878d7c83914d382c2646da 100644 (file)
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -64,7 +64,9 @@ AC_SUBST(BINDCONFIG)
 # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
 AC_USE_SYSTEM_EXTENSIONS
 
+@BEGIN WITHOUT LIBTOOL
 AC_PROG_RANLIB
+@END WITHOUT LIBTOOL
 
 AC_PATH_PROG(AR, ar)
 AC_SUBST(AR)
@@ -833,21 +835,36 @@ BINDLT=
 AC_ARG_ENABLE(libtool,
        AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
        want_libtool="$enableval")
+
 @BEGIN WITH LIBTOOL
 if test "$want_libtool" = "no"; then
        AC_MSG_ERROR([libtool configure is used but libtool is disabled?])
 fi
+
+DHLIBS=LTLIBRARIES
 A=la
 BINDLT=--with-libtool
 @END WITH LIBTOOL
+
 @BEGIN WITHOUT LIBTOOL
 if test "$want_libtool" = "yes"; then
        AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
-       cd $srcdir; exec ./re-conf $ac_configure_args
+       # dequote $ac_configure_args
+       eval "set my_configure_args $ac_configure_args"
+       shift
+       re_configure_args=
+       for a; do
+               re_configure_args="$re_configure_args $a"
+       done
+       cd $srcdir; exec ./re-conf $re_configure_args
        AC_MSG_ERROR([Recovering failed])
 fi
+
+DHLIBS=LIBRARIES
 A=a
 @END WITHOUT LIBTOOL
+
+AC_SUBST(DHLIBS)
 AC_SUBST(A)
 AC_SUBST(BINDLT)
 

diff --git a/configure.ac-lt b/configure.ac-lt
index 338879b4660d4b4e3d30c4cfbba178f31a5153c1..abd8ab617db858b9c72f8a88968a271c6ee53560 100644 (file)
--- a/configure.ac-lt
+++ b/configure.ac-lt
@@ -825,18 +825,25 @@ BINDLT=
 AC_ARG_ENABLE(libtool,
        AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
        want_libtool="$enableval")
-if test "$want_libtool" = "yes"; then
+
+
 if test "$want_libtool" = "yes"; then
        AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
-       AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
-       cd $srcdir; exec ./re-conf $ac_configure_args
-       cd $srcdir; exec ./re-conf $ac_configure_args
-       AC_MSG_ERROR([Recovering failed])
+       # dequote $ac_configure_args
+       eval "set my_configure_args $ac_configure_args"
+       shift
+       re_configure_args=
+       for a; do
+               re_configure_args="$re_configure_args $a"
+       done
+       cd $srcdir; exec ./re-conf $re_configure_args
        AC_MSG_ERROR([Recovering failed])
 fi
-fi
-A=a
+
+DHLIBS=LIBRARIES
 A=a
+
+AC_SUBST(DHLIBS)
 AC_SUBST(A)
 AC_SUBST(BINDLT)
 

diff --git a/dhcpctl/Makefile.am.in b/dhcpctl/Makefile.am.in
index dc44e1ada95961d1ef1c26489b72594906b30ebd..e94deb23802585453c8ab0477d495da0bf7773fb 100644 (file)
--- a/dhcpctl/Makefile.am.in
+++ b/dhcpctl/Makefile.am.in
@@ -1,5 +1,5 @@
 bin_PROGRAMS = omshell
-lib_LIBRARIES = libdhcpctl.@A@
+lib_@DHLIBS@ = libdhcpctl.@A@
 noinst_PROGRAMS = cltest
 man_MANS = omshell.1 dhcpctl.3
 EXTRA_DIST = $(man_MANS)
@@ -11,7 +11,7 @@ omshell_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
                @BINDLIBISCCFGDIR@/libisccfg.@A@ \
                @BINDLIBISCDIR@/libisc.@A@
 
-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
+libdhcpctl_@A@_SOURCES = dhcpctl.c callback.c remote.c
 
 cltest_SOURCES = cltest.c
 cltest_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \

diff --git a/omapip/Makefile.am.in b/omapip/Makefile.am.in
index bf1dd09b17d517e435e745a8c3ce1ea2dd9e2db0..177b73f57e14dca02a1b6b3e189148b5635ba4b4 100644 (file)
--- a/omapip/Makefile.am.in
+++ b/omapip/Makefile.am.in
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libomapi.@A@
+lib_@DHLIBS@ = libomapi.@A@
 noinst_PROGRAMS = svtest
 
 libomapi_@A@_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \

diff --git a/re-conf b/re-conf
index 2a776fdb8afb123a8bbb2f48e79dd5f67da92cd9..e6d8d6cdc8edda3e36a45764849ac2af55094dae 100755 (executable)
--- a/re-conf
+++ b/re-conf
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# called by the configure place-holder
+# called by the legacy configure when libtool is enabled
 
 cp configure.ac+lt configure.ac
-autoreconf -i && ./configure $*
+autoreconf -i
+echo Reconfiguring with $*
+./configure $*

diff --git a/tests/Makefile.am.in b/tests/Makefile.am.in
index 25f490bb8607daae3870f5ea97e2b38f4173bfb3..1ef670970439f26cd74e496932f45293f4a30d08 100644 (file)
--- a/tests/Makefile.am.in
+++ b/tests/Makefile.am.in
@@ -28,6 +28,6 @@ EXTRA_DIST = failover/dhcp-1.cf failover/dhcp-2.cf failover/new-failover \
 
 AM_CPPFLAGS = -I..
 
-check_LIBRARIES = libt_api.@A@
+check_@DHLIBS@ = libt_api.@A@
 libt_api_@A@_SOURCES = t_api.c t_api_dhcp.c
 

diff --git a/util/lt.pl b/util/lt.pl
index da49382667860935e44eb2483075fcc449b7c8ae..eed17fe3a094498e1229fd4470d7d881e25b46be 100644 (file)
--- a/util/lt.pl
+++ b/util/lt.pl
@@ -118,7 +118,6 @@ foreach $line (<STDIN>) {
            $escaped += 1;
            next;
        } else {
-           print $line. "\n";
            $included += 1;
        }
     }