From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: Sun, 14 May 2000 08:07:23 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBLTDL_CONVENIENCE, AC_LIBLTDL_INSTALLABLE):
X-Git-Tag: multi-language-merge-point~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4722bef705e92bf4a37265c11b2806eb84908c;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBLTDL_CONVENIENCE, AC_LIBLTDL_INSTALLABLE):
Pick LIBLTLD from top_builddir and INCLTDL from top_srcdir.
* mdemo/configure.in: Remove comments on
AC_LIBLTLD_CONVENIENCE.
---

diff --git a/ChangeLog b/ChangeLog
index 99ca7f8f6..be63a7647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-14  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+	* libtool.m4 (AC_LIBLTDL_CONVENIENCE, AC_LIBLTDL_INSTALLABLE):
+	Pick LIBLTLD from top_builddir and INCLTDL from top_srcdir.
+	* mdemo/configure.in: Remove comments on
+	AC_LIBLTLD_CONVENIENCE.
+
 	* configure.in: Look for C++ compiler.
 	* Makefile.am (libtool): Configure CXX tag.
 	* tests/Makefile.am: Test tagdemo only if CXX found.
diff --git a/libtool.m4 b/libtool.m4
index 34eb58506..e65e927a5 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -650,8 +650,8 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-  INCLTDL=ifelse($#,1,-I$1,['-I${top_srcdir}/libltdl'])
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@@ -674,8 +674,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-    INCLTDL=ifelse($#,1,-I$1,['-I${top_srcdir}/libltdl'])
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
diff --git a/mdemo/configure.in b/mdemo/configure.in
index c01bdf264..93ff01ef1 100644
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -7,10 +7,6 @@ AC_PROG_CC
 AC_C_CONST
 AC_EXEEXT
 
-dnl AC_LIBLTDL_CONVENIENCE(['${top_builddir}/../libltdl'])
-dnl Since the package is flat, we need not use the line above,
-dnl and not having macros in LIBLTDL allows us to build LIBLTDL
-dnl on demand even with broken makes
 AC_LIBLTDL_CONVENIENCE(../libltdl)
 AC_SUBST(LIBLTDL)