Re: Consider adding -I $macrodir

[Ralf Wildenhues]

Hi Jan,

* Jan Engelhardt wrote on Sun, Mar 13, 2011 at 03:31:40PM CET:
> I have seen one project where Makefile.am used
> 
>       ACLOCAL_AMFLAGS = -Im4
> 
> and libtool 2.2.6b still threw the warning
> 
>       Consider adding -I m4 to Makefile.am
> 
> which is because libtool does not seem to handle bundled arguments.

Thanks.  I'm pushing the patch below and adding you to THANKS.

Cheers,
Ralf

    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.

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 844698c..cd15c58 100644
--- 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