aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobia Tesan2014-09-21 19:25:15 +0200
committerTobia Tesan2014-09-21 20:23:49 +0200
commitba9401864ccc9b2aada36db12ab3a931a18b787c (patch)
tree01a938f60fb967a192b2ea332f0cdd82298b0a16
parent651b271f6102fc349c679172e069354049a6626b (diff)
downloadscummvm-rg350-ba9401864ccc9b2aada36db12ab3a931a18b787c.tar.gz
scummvm-rg350-ba9401864ccc9b2aada36db12ab3a931a18b787c.tar.bz2
scummvm-rg350-ba9401864ccc9b2aada36db12ab3a931a18b787c.zip
CONFIGURE: Use pkgconfig to get CFLAGS for Unity if not supplied
This is not necessary if we got --with-libunity-prefix= (line 1447). That's not always the case though.
-rwxr-xr-xconfigure4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index 7166dd7f68..5264e32410 100755
--- a/configure
+++ b/configure
@@ -3863,6 +3863,10 @@ EOF
esac
fi
if test "$_libunity" = yes ; then
+ if test "$LIBUNITY_CFLAGS" = "" || test "$LIBUNITY_LIBS" = ""; then
+ LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
+ LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
+ fi
LIBS="$LIBS $LIBUNITY_LIBS"
INCLUDES="$INCLUDES $LIBUNITY_CFLAGS"
fi