diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-06-12 08:30:20 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-06-12 08:30:20 +0000 |
commit | 21888634686506a6938e435f9c4fd5a9f20ccc3e (patch) | |
tree | 6feb290616af2d078b6e9164794e1ae291058f7a | |
parent | 46a6bafafc3f83c5dbccf20eae52db71c67dfe06 (diff) |
fix #132440
Original commit message from CVS:
fix #132440
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | m4/as-scrub-include.m4 | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2004-06-12 Thomas Vander Stichele <thomas at apestaart dot org> + + * m4/as-scrub-include.m4: + sync with upstream to 0.1.4. Fixes #132440 + 2004-06-07 Benjamin Otte <otte@gnome.org> * m4/gst-feature.m4: diff --git a/m4/as-scrub-include.m4 b/m4/as-scrub-include.m4 index 9e714c9..e03f863 100644 --- a/m4/as-scrub-include.m4 +++ b/m4/as-scrub-include.m4 @@ -1,12 +1,11 @@ -dnl as-scrub-include.m4 0.0.3 +dnl as-scrub-include.m4 0.0.4 dnl autostars m4 macro for scrubbing CFLAGS of system include dirs dnl because gcc 3.x complains about including system including dirs - dnl Thomas Vander Stichele <thomas at apestaart dot org> -dnl $Id: as-scrub-include.m4,v 1.6 2004/05/24 16:13:27 thomasvs Exp $ +dnl $Id: as-scrub-include.m4,v 1.7 2004/06/12 08:30:20 thomasvs Exp $ dnl This macro uses output of cpp -v and expects it to contain text that dnl looks a little bit like this: @@ -30,7 +29,8 @@ AC_DEFUN([AS_SCRUB_INCLUDE], dnl line INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'` for dir in $INCLUDE_DIRS; do - GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e 's#-I$dir ##'` + dnl use "" as the sed script so $dir gets expanded + GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s#-I$dir ##"` done [$1]=$GIVEN_CFLAGS ]) |