From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 10 Mar 1999 21:23:37 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE):
X-Git-Tag: release-1-2f~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec1c9b76464fdfc98aa88da9e188e24dd5ee38c2;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE):
avoid introducing multiple --enable options when re-running
config.status
* libltdl/configure.in: if enable_ltdl_* is not set, assume no
* configure.in: if enable_ltdl_install is not set, enable it
---

diff --git a/ChangeLog b/ChangeLog
index e9a75a86a..c4e2cae3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-03-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE): 
+	avoid introducing multiple --enable options when re-running
+	config.status
+	* libltdl/configure.in: if enable_ltdl_* is not set, assume no
+	* configure.in: if enable_ltdl_install is not set, enable it
+
 	* libltdl/configure.in: only assume implicit installation if
 	libltdl was libtoolized.  If not, print a warning message
 	suggesting the use of --enable-ltdl-install or of one of the
diff --git a/configure.in b/configure.in
index b62da5a79..3ee51d707 100644
--- a/configure.in
+++ b/configure.in
@@ -48,8 +48,9 @@ AC_SUBST(LIBTOOL_FLAGS)
 
 AC_ARG_ENABLE(ltdl-install,
 [  --disable-ltdl-install  do not install libltdl])
-if test x"$enable_ltdl_install" = xno; then
-  ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+if test x"${enable_ltdl_install+set}" != xset; then
+  enable_ltdl_install=yes
+  ac_configure_args="$ac_configure_args --enable-ltdl-install"
 fi
 AC_CONFIG_SUBDIRS(libltdl)
 
diff --git a/libltdl/configure.in b/libltdl/configure.in
index 510e71dba..5af3f1d38 100644
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -27,8 +27,8 @@ AC_SUBST(LIBTOOL_DEPS)
 AC_ARG_ENABLE(ltdl-install,
 [  --enable-ltdl-install   install libltdl])
 
-AM_CONDITIONAL(INSTALL_LTDL, test x"$enable_ltdl_install" != xno)
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"$enable_ltdl_convenience" != xno)
+AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
+AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
 
 AC_CACHE_CHECK([which extension is used for shared libraries],
   libltdl_cv_shlibext, [dnl
diff --git a/libtool.m4 b/libtool.m4
index 04bab79d4..e8f9bae5d 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -620,8 +620,12 @@ AC_CHECK_LIB(m, cos)
 # flat, and, if you're not using automake, define top_builddir as
 # appropriate in the Makefiles.
 AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
+  case "$enable_ltdl_convenience" in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
   LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-  ac_configure_args="$ac_configure_args --enable-ltdl-convenience"
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@@ -635,10 +639,13 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
   AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
-    enable_ltdl_install=yes
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    case "$enable_ltdl_install" in
+    no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
+    "") enable_ltdl_install=yes
+        ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
+    esac
   ])
-  if test x"$enable_ltdl_install" = x"yes"; then
+  if test x"$enable_ltdl_install" != x"no"; then
     LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
   fi
 ])