diff options
| author | Francis Dupont <fdupont@isc.org> | 2016-10-06 16:15:35 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2016-10-06 16:15:35 +0200 |
| commit | d113bc2ca69a6f6a33139c3708a4ea6818605b69 (patch) | |
| tree | b9461aab0a1c8ceef996db075ec85b87fee42fc8 /configure.ac-base | |
| parent | 13e5cc6cbe83ac7cd9285a54e870e4f8ab16a604 (diff) | |
| download | isc-dhcp-d113bc2ca69a6f6a33139c3708a4ea6818605b69.tar.gz | |
Half fixed recovering (no space handling) (unfinished)
Diffstat (limited to 'configure.ac-base')
| -rw-r--r-- | configure.ac-base | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/configure.ac-base b/configure.ac-base index d973fd4a..4b109ced 100644 --- 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) |