* 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 04a1bb0c5b881042f84cfebb3430ec4d963c746f..9ca7b97504e84210b0b37ba796074978169d209c 100644 (file)
--- 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.
+
        * libtool.m4 (_AC_PROG_LIBTOOL): Renamed from...
        (AC_PROG_LIBTOOL): Just AC_REQUIRE(_AC_PROG_LIBTOOL), to avoid
        effects of multiple runs.

diff --git a/libtool.m4 b/libtool.m4
index eb380e8d0cec7d7e9b23f95c87e91641ce9ec798..7dd6384370296d0100461a48908fbe5d4550f36c 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -666,8 +666,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
@@ -690,8 +690,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 fe1a6762275c819c83ffbc43518ce35daa43cd70..4ea7cbe53d081660ec30b8f6b219c1f0a1c651d2 100644 (file)
--- 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(INCLTDL)
 AC_SUBST(LIBLTDL)