From ba9401864ccc9b2aada36db12ab3a931a18b787c Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sun, 21 Sep 2014 19:25:15 +0200 Subject: [PATCH] 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. --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 7166dd7f68d..5264e324108 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