From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 16 Jan 2008 18:35:05 +0000 (+0000)
Subject: * libltdl/m4/ltdl.m4 (_LT_ENABLE_INSTALL): Use AM_CONDITIONAL
X-Git-Tag: release-2-1b~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3afaae7d8ef6513323054282746c5f1c71320706;p=thirdparty%2Flibtool.git

* libltdl/m4/ltdl.m4 (_LT_ENABLE_INSTALL): Use AM_CONDITIONAL
only if defined.  Allows to use libltdl without aclocal.
---

diff --git a/ChangeLog b/ChangeLog
index 6bb325240..c8a2b3b97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/m4/ltdl.m4 (_LT_ENABLE_INSTALL): Use AM_CONDITIONAL
+	only if defined.  Allows to use libltdl without aclocal.
+
 2008-01-16  Peter O'Gorman  <peter@pogma.com>
 
 	* libltdl/m4/libtool.m4: Set GCC var for every tag, avoids need
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 435eed16c..74a571bda 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -388,8 +388,9 @@ case ,${enable_ltdl_install},${enable_ltdl_convenience} in
   *) enable_ltdl_convenience=yes ;;
 esac
 
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
+m4_ifdef([AM_CONDITIONAL],
+[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
+ AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)])
 ])# _LT_ENABLE_INSTALL