* 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 2ec65705ba1c8052992e1c30a2e35926cc2a0045..b8eeeb386adc49d984850704f671dcfc4fbd1a8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +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.
+
 2000-05-03  John Wehle  (john@feith.com)
 
        * ltconfig.in (hpux10.20*): use file_magic for

diff --git a/libtool.m4 b/libtool.m4
index 47abe430644da574e3dbe39065a2a2829d18623b..955d8b593451d27d8def76cce02394c614f716df 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1,5 +1,5 @@
 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996-1999 Free Software Foundation, Inc.
+## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -384,8 +384,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_builddir}/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
@@ -408,8 +408,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_builddir}/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 c01bdf2645928676644fe01ec56e6beebc9f2535..93ff01ef18eff7681f2d9ce0bd72cf18220d6ced 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(LIBLTDL)