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 39f84c6eba7557d73e6dacae3afb40a164c62ba1 (commit)
from 6a6de36e4c652fd0eba739c209a3b43ae7a41a5b (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 39f84c6eba7557d73e6dacae3afb40a164c62ba1
Author: Ralf Wildenhues <[email protected]>
Date: Mon Mar 14 07:30:53 2011 +0100
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
THANKS | 1 +
libtoolize.m4sh | 17 ++++++++++-------
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 528e404..4ed09a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-14 Ralf Wildenhues <[email protected]>
+
+ 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 <[email protected]>
On Mac OS X try .dylib as well as .so with lt_dlopenext
diff --git a/THANKS b/THANKS
index 0b03320..08d7077 100644
--- a/THANKS
+++ b/THANKS
@@ -109,6 +109,7 @@
Jakub Bogusz [email protected]
Jacob Meuser [email protected]
James Su [email protected]
+ Jan Engelhardt [email protected]
Jay Krell [email protected]
Jeff Squyres [email protected]
Jeremy C. Reed [email protected]
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
hooks/post-receive
--
GNU Libtool
