From 39f84c6eba7557d73e6dacae3afb40a164c62ba1 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 14 Mar 2011 07:30:53 +0100 Subject: [PATCH] libtoolize: detect -I (without space) in ACLOCAL_AMFLAGS. * libtoolize.m4sh (func_scan_files): Also accept -I (without intervening space) in ACLOCAL_AMFLAGS. * THANKS: Update. Report from Jan Engelhardt. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ THANKS | 1 + libtoolize.m4sh | 17 ++++++++++------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 528e404e3..4ed09a39c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-03-14 Ralf Wildenhues + + libtoolize: detect -I (without space) in ACLOCAL_AMFLAGS. + * libtoolize.m4sh (func_scan_files): Also accept -I + (without intervening space) in ACLOCAL_AMFLAGS. + * THANKS: Update. + Report from Jan Engelhardt. + 2011-03-04 Peter O'Gorman On Mac OS X try .dylib as well as .so with lt_dlopenext diff --git a/THANKS b/THANKS index 0b0332082..08d707744 100644 --- 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 844698c90..cd15c58af 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 -- 2.47.2