aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2013-07-04 01:20:13 +0200
committerJohannes Schickel2013-07-04 01:20:13 +0200
commit83f705583681c6157e8ba33d9dd542f434dcb94b (patch)
treeea6475ab726be7da4bc7ac7192a6fd6832281624
parente457fc2a268be4ef5e32a51ec58f15aeb476ec8a (diff)
downloadscummvm-rg350-83f705583681c6157e8ba33d9dd542f434dcb94b.tar.gz
scummvm-rg350-83f705583681c6157e8ba33d9dd542f434dcb94b.tar.bz2
scummvm-rg350-83f705583681c6157e8ba33d9dd542f434dcb94b.zip
CONFIGURE: Remove POSIXisms in configure.
This allows configure to work fine on Solaris 10 again. This fixes bug #3614513 "A few posixisms have crept into configure (w/ patch)". Thanks to lblume for his patch.
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index dbd78d3f9d..91118bd88f 100755
--- a/configure
+++ b/configure
@@ -2176,7 +2176,7 @@ case $_host_os in
# When not cross-compiling, enable large file support, but don't
# care if getconf doesn't exist or doesn't recognize LFS_CFLAGS.
if test -z "$_host"; then
- CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
+ CXXFLAGS="$CXXFLAGS `getconf LFS_CFLAGS 2>/dev/null`"
fi
;;
maemo)
@@ -3563,8 +3563,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.4 2>> "$TMPLOG"`"
+ LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG"`"
_libunity=no
cat > $TMPC << EOF
#include <unity.h>