libltdl: edit AM_CPPFLAGS correctly for libltdl/Makefile.am.

* libltdl/ltdl.mk (AM_CPPFLAGS): Make sure the sed expression to
remove the first libltdl/ on each line is not confused by misuse
of linebreaks.
* Makefile.am (lt_Makefile_am): Also edit out the duplicated
include paths after libltdl/ elimination.
* NEWS: Update.
Reported by Michael Wobst

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/Makefile.am b/Makefile.am
index 1fb5e5d336e920c4661f3fd3fcaccc671dded8a6..f1b7ead23bc8d29449f6889568092b9b2d2995db 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,6 +191,7 @@ $(lt_Makefile_am): $(ltdl_mk)
          '$(SED)' -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' \
              '$(ltdl_mk)' \
            |'$(SED)' -e 's|libltdl_||; s|libltdl/||; s|: libltdl/|: |' \
+             -e '/^[    ]*-I\$$(srcdir)\/libltdl -Ilibltdl \\/d' \
              -e 's|\$$(libltdl_|$$(|' \
        ) |'$(SED)' -e '/^.. DO NOT REMOVE THIS LINE -- /d' \
              -e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with automake to produce Makefile.in,' > '$@'

diff --git a/NEWS b/NEWS
index 5eab04626e401740254cca6e2a8e99727fe6d8c9..4f5c3f3e59c4c2a8a2847b6d17fea024a081a1cc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool
   - freebsd-elf library versioning was upgraded incorrectly in 2.4.4,
     but now works properly again.
 
+  - Fix a 2.4.4 regression so that libltdl subprojects do not warn
+    about missing libltdl/libltdl directory as in prior releases.
+
 
 * Noteworthy changes in release 2.4.4 (2014-11-29) [stable]
 

diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index 4d32de934a29851f547a9bf00115388cbe305f1e..6ce3c400b610633d00d6d0f5ee72f257befe0504 100644 (file)
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -34,9 +34,9 @@
 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
 # (not as a sub-package!) using 'nostdinc':
 AM_CPPFLAGS           += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
-                         -DLTDL -I. -I$(srcdir) \
-                         -Ilibltdl  -I$(srcdir)/libltdl \
-                         -Ilibltdl/libltdl -I$(srcdir)/libltdl/libltdl
+                         -DLTDL -I. -I$(srcdir) -Ilibltdl \
+                         -I$(srcdir)/libltdl -Ilibltdl/libltdl \
+                         -I$(srcdir)/libltdl/libltdl
 AM_LDFLAGS            += -no-undefined
 LTDL_VERSION_INFO      = -version-info 10:1:3