diff options
| author | Eugene Sandulenko | 2014-09-23 13:42:46 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-09-23 13:42:46 +0200 |
| commit | 04767e7b2a826f94e1daf259264f7f86cc515983 (patch) | |
| tree | 9a340dc917c9c04937aec2a99b181925a22077a9 | |
| parent | dfe9cf26187509b8aad8454374925aea739684c6 (diff) | |
| parent | ba9401864ccc9b2aada36db12ab3a931a18b787c (diff) | |
| download | scummvm-rg350-04767e7b2a826f94e1daf259264f7f86cc515983.tar.gz scummvm-rg350-04767e7b2a826f94e1daf259264f7f86cc515983.tar.bz2 scummvm-rg350-04767e7b2a826f94e1daf259264f7f86cc515983.zip | |
Merge pull request #511 from tobiatesan/unity
CONFIGURE: Fix support for libunity in configure
| -rwxr-xr-x | configure | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -3848,8 +3848,8 @@ if test "$_libunity" = auto ; then ;; *) # Unity has a lots of dependencies, update the libs and cflags var with them - LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs unity = 3.8.4 2>> "$TMPLOG"`" - LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG"`" + 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"`" _libunity=no cat > $TMPC << EOF #include <unity.h> @@ -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 |