Changeset 1459

Timestamp:

Dec 31, 2009 1:11:54 PM (11 years ago)

Author:

stefan

Message:

put CYGPATH_W into include paths

File:

• stable/BSPsplit/coin.m4 (modified) (2 diffs)

stable/BSPsplit/coin.m4

@@ -3459 +3459 @@
 
 AC_COIN_PKG_CHECK_MODULE_EXISTS([$1],[$2],
-  [ m4_toupper($1)[]_CFLAGS=`$PKG_CONFIG --cflags "$2" 2>/dev/null`
+  [ cflags=`$PKG_CONFIG --cflags "$2" 2>/dev/null`
+    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
+        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
+        # but only do this if is not trivial
+    if test "$CYGPATH_W" != "echo" ; then
+      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
+          [cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`]
+        fi
+    m4_toupper($1)[]_CFLAGS="$cflags"
     m4_toupper($1)[]_LIBS=`$PKG_CONFIG --libs "$2" 2>/dev/null`
     m4_toupper($1)[]_DATA=`$PKG_CONFIG --variable=datadir "$2" 2>/dev/null`
@@ -3657 +3665 @@
                    [directory with header files for using module $1]),
     [m4_tolower(coin_has_$1)=yes
-     m4_toupper($1_CFLAGS)="-I$withval"],
+     m4_toupper($1_CFLAGS)="-I`${CYGPATH_W} $withval`"],
     [])