Changeset 2098 for stable

Timestamp:

Jan 28, 2011 1:01:33 PM (10 years ago)

Author:

stefan

Message:

bugfix: setup X_INSTALLED variables also if project flags are given by user and pkg-config is disabled

File:

• stable/0.7/coin.m4 (modified) (3 diffs)

stable/0.7/coin.m4

@@ -3111 +3111 @@
          m4_toupper(myvar)_LIBS="$withval $m4_toupper(myvar)_LIBS"
        ])
+       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
+       if test -z "$PKG_CONFIG" ; then
+         m4_toupper($1_LIBS_INSTALLED)="$withval"
+         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_LIBS_INSTALLED="$withval $m4_toupper(myvar)_LIBS_INSTALLED"])
+       fi
      fi
     ],
@@ -3125 +3130 @@
        m4_tolower(coin_has_$1)=yes
        m4_toupper($1_CFLAGS)="-I`${CYGPATH_W} $withval`"
-       coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="$withval $m4_toupper(myvar)_CFLAGS"])
+       coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="-I`${CYGPATH_W} $withval` $m4_toupper(myvar)_CFLAGS"])
+       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
+       if test -z "$PKG_CONFIG" ; then
+         m4_toupper($1_CFLAGS_INSTALLED)="$m4_toupper($1_CFLAGS)"
+         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS_INSTALLED="$m4_toupper($1_CFLAGS) $m4_toupper(myvar)_CFLAGS_INSTALLED"])
+       fi
      fi
     ],
@@ -3140 +3150 @@
        m4_tolower(coin_has_$1)=yes
        m4_toupper($1_DATA)="$withval"
+       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
+       if test -z "$PKG_CONFIG" ; then
+         m4_toupper($1_DATA_INSTALLED)="$withval"
+       fi
      fi
     ],