* libtool.m4 (AC_LIBLTDL_CONVENIENCE): Add -I${top_srcdir}/libltdl

to default INCLTDL for VPATH.
(AC_LIBLTDL_INSTALLABLE): ditto.
Reported by Tom Tromey <tromey@cygnus.com>

diff --git a/ChangeLog b/ChangeLog
index 69c8b919e595d70b4b902112abf660cbe5162bfa..f3f20194b826ff4e2237f45cf394f8703f81df25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-13  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+
+       * libtool.m4 (AC_LIBLTDL_CONVENIENCE): Add -I${top_srcdir}/libltdl
+       to default INCLTDL for VPATH.
+       (AC_LIBLTDL_INSTALLABLE): ditto.
+       Reported by Tom Tromey <tromey@cygnus.com>
+
 2000-01-12  Thomas Tanner  <tanner@ffii.org>
 
        * update all copyright notices to 2000

diff --git a/libtool.m4 b/libtool.m4
index 8a2b5e6eac999529145c74d8bf9163c1bfa48c9b..9fc370e75f8af8a0b5be9f0be7fa81d7e8b20e6c 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -637,7 +637,8 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
       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'])
+  INCLTDL=ifelse($#,1,-I$1,
+  ['-I${top_builddir}/libltdl -I${top_srcdir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@@ -661,7 +662,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'])
+    INCLTDL=ifelse($#,1,-I$1,
+    ['-I${top_builddir}/libltdl -I${top_srcdir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"