diff options
| -rwxr-xr-x | configure.ac | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index f1266c2ed..3c91519a3 100755 --- a/configure.ac +++ b/configure.ac @@ -118,10 +118,10 @@ AC_TYPE_SSIZE_T AC_PATH_PROG(PKG_CONFIG, pkg-config) AC_PATH_PROG(CURL_CONFIG, curl-config) -LIBS="`$PKG_CONFIG --libs zlib` $LIBS" -CPPFLAGS="`$PKG_CONFIG --cflags zlib` $CPPFLAGS" -LIBS="`$PKG_CONFIG --libs libpng` $LIBS" -CPPFLAGS="`$PKG_CONFIG --cflags libpng` $CPPFLAGS" +LIBS="$LIBS `$PKG_CONFIG --libs zlib`" +CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags zlib`" +LIBS="$LIBS `$PKG_CONFIG --libs libpng`" +CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libpng`" # Checks for internationalization support AM_GNU_GETTEXT([external],[need-ngettext]) @@ -134,19 +134,19 @@ AC_ARG_WITH(sdl2,[ --with-sdl2 enable SDL 2 support] ) if test "x$with_sdl2" == "xyes"; then AC_PATH_PROG(SDL_CONFIG, sdl2-config) if test -n "$SDL_CONFIG"; then - LIBS="`$SDL_CONFIG --libs` $LIBS" - CPPFLAGS="`$SDL_CONFIG --cflags` $CPPFLAGS" + LIBS="$LIBS `$SDL_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$SDL_CONFIG --cflags`" fi - LIBS="`$PKG_CONFIG --libs SDL2_gfx` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL2_gfx` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL2_image` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL2_image` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL2_mixer` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL2_mixer` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL2_net` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL2_net` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL2_ttf` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL2_ttf` $CPPFLAGS" + LIBS="$LIBS `$PKG_CONFIG --libs SDL2_gfx`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_gfx`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL2_image`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_image`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL2_mixer`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_mixer`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL2_net`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_net`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL2_ttf`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_ttf`" AC_CHECK_LIB([SDL2], [SDL_Init], , AC_MSG_ERROR([ *** Unable to find SDL2 library (http://www.libsdl.org/)])) @@ -168,19 +168,19 @@ if test "x$with_sdl2" == "xyes"; then else AC_PATH_PROG(SDL_CONFIG, sdl-config) if test -n "$SDL_CONFIG"; then - LIBS="`$SDL_CONFIG --libs` $LIBS" - CPPFLAGS="`$SDL_CONFIG --cflags` $CPPFLAGS" + LIBS="$LIBS `$SDL_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$SDL_CONFIG --cflags`" fi - LIBS="`$PKG_CONFIG --libs SDL_gfx` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL_gfx` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL_image` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL_image` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL_mixer` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL_mixer` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL_net` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL_net` $CPPFLAGS" - LIBS="`$PKG_CONFIG --libs SDL_ttf` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags SDL_ttf` $CPPFLAGS" + LIBS="$LIBS `$PKG_CONFIG --libs SDL_gfx`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL_gfx`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL_image`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL_image`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL_mixer`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL_mixer`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL_net`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL_net`" + LIBS="$LIBS `$PKG_CONFIG --libs SDL_ttf`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL_ttf`" if test "x$naclbuild_enabled" == "xfalse"; then AC_CHECK_LIB([SDL], [SDL_Init], , @@ -253,8 +253,8 @@ AC_CHECK_HEADERS([physfs.h], , AC_MSG_ERROR([ *** PhysFS library found but cannot find headers (http://icculus.org/physfs/)])) if test -n "$CURL_CONFIG"; then - LIBS="`$CURL_CONFIG --libs` $LIBS" - CPPFLAGS="`$CURL_CONFIG --cflags` $CPPFLAGS" + LIBS="$LIBS `$CURL_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`" fi AC_CHECK_LIB([curl], [curl_global_init], , AC_MSG_ERROR([ *** Unable to find CURL library (http://curl.haxx.se/)])) @@ -290,8 +290,8 @@ esac if test "$xmllib" == "libxml"; then if test -n "$PKG_CONFIG"; then - LIBS="`$PKG_CONFIG --libs libxml-2.0` $LIBS" - CPPFLAGS="`$PKG_CONFIG --cflags libxml-2.0` $CPPFLAGS" + LIBS="$LIBS `$PKG_CONFIG --libs libxml-2.0`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libxml-2.0`" fi AC_CHECK_LIB([xml2], [xmlInitParser], , AC_MSG_ERROR([ *** Unable to find libxml2 library (http://xmlsoft.org/)])) |