[SCM] GNU Libtool branch, master, updated. v2.4.4-5-g57a78dd

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  57a78dd5310fda320c51657f09e13a985961ef85 (commit)
      from  218bf6f4c2ed02ee13293b2100238008ef225405 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57a78dd5310fda320c51657f09e13a985961ef85
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 4 14:38:01 2014 +0000

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am     |    1 +
 NEWS            |    3 +++
 libltdl/ltdl.mk |    6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1fb5e5d..f1b7ead 100644
--- 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 5eab046..4f5c3f3 100644
--- 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 4d32de9..6ce3c40 100644
--- 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
 


hooks/post-receive
-- 
GNU Libtool