libtoolize: detect -I<dir> (without space) in ACLOCAL_AMFLAGS.

* libtoolize.m4sh (func_scan_files): Also accept -I<dir>
(without intervening space) in ACLOCAL_AMFLAGS.
* THANKS: Update.
Report from Jan Engelhardt.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 528e404e37ca5113020ee0e20f0a57effbf24e25..4ed09a39caddb41eb1b9c4e82008eab9d9fc56ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       libtoolize: detect -I<dir> (without space) in ACLOCAL_AMFLAGS.
+       * libtoolize.m4sh (func_scan_files): Also accept -I<dir>
+       (without intervening space) in ACLOCAL_AMFLAGS.
+       * THANKS: Update.
+       Report from Jan Engelhardt.
+
 2011-03-04  Peter O'Gorman  <peter@pogma.com>
 
        On Mac OS X try .dylib as well as .so with lt_dlopenext

diff --git a/THANKS b/THANKS
index 0b0332082ee3126a98af574fc668bcca66a2f7df..08d707744139a974055b4e66b95863c7d3cdcfe7 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -109,6 +109,7 @@
   Jakub Bogusz                 qboosh@pld-linux.org
   Jacob Meuser                 jakemsr@jakemsr.com
   James Su                     james.su@gmail.com
+  Jan Engelhardt               jengelh@medozas.de
   Jay Krell                    jay.krell@cornell.edu
   Jeff Squyres                 jsquyres@lam-mpi.org
   Jeremy C. Reed               reed@reedmedia.net

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 844698c9091ad0854ada10de7766ff681bbcbdc6..cd15c58afa1857b50f7d98dc1ec58c9c259950c1 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -556,8 +556,8 @@ func_scan_files ()
     # Hunt for ACLOCAL_AMFLAGS in `Makefile.am' for a `-I' argument.
 
     my_sed_aclocal_flags='
-        /^[     ]*ACLOCAL_[A-Z_]*FLAGS[         ]*=/ {
-           s,^[^=]*=[   ]*\(.*\), \1,
+        /^[     ]*ACLOCAL_[A-Z_]*FLAGS[         ]*=[    ]*/ {
+           s,,,
            q
        }
        d'
@@ -568,11 +568,14 @@ func_scan_files ()
           am_macrodir="$arg"
           break
         else
-          if test "X$arg" = "X-I"; then
-            my_macrodir_is_next=:
-          else
-            my_macrodir_is_next=false
-          fi
+         case $arg in
+           -I) my_macrodir_is_next=: ;;
+           -I*)
+             am_macrodir=`$ECHO "$arg" | sed 's,^-I,,'`
+             break
+             ;;
+           *) my_macrodir_is_next=false ;;
+         esac
         fi
       done
     fi