diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:49:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
| commit | 379f978387a8b017a41c2682c0b39444f17a2230 (patch) | |
| tree | 4329e3a1b12516f8db66389e90125ee43c1ab0a0 /configure.ac | |
| parent | 46648159bfc18cf29196ae8eba5a64decf10c45b (diff) | |
normalize values of SYSTEM_FREETYPE, SYSTEM_LIBXML, SYSTEM_MARIADB
Change-Id: Iffcc671ca41c5880579effe0786a3b4d3be0dab0
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 4fecc7b5327a..fc59e5a0ed76 100644 --- a/configure.ac +++ b/configure.ac @@ -7877,7 +7877,7 @@ if test "$test_freetype" = "yes"; then # 9.9.3 is 2.2.0 PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.9.3) FREETYPE_CFLAGS=$(printf '%s' "$FREETYPE_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - SYSTEM_FREETYPE=YES + SYSTEM_FREETYPE=TRUE _save_libs="$LIBS" _save_cflags="$CFLAGS" LIBS="$LIBS $FREETYPE_LIBS" @@ -7980,7 +7980,7 @@ AC_SUBST(XSLTPROC) AC_MSG_CHECKING([which libxml to use]) if test "$with_system_libxml" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_LIBXML=YES + SYSTEM_LIBXML=TRUE if test "$_os" = "Darwin"; then dnl make sure to use SDK path LIBXML_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2" @@ -8006,7 +8006,7 @@ if test "$with_system_libxml" = "yes"; then libo_MINGW_TRY_DLL([zlib1]) else AC_MSG_RESULT([internal]) - SYSTEM_LIBXML=NO + SYSTEM_LIBXML= BUILD_TYPE="$BUILD_TYPE LIBXML2" fi AC_SUBST(SYSTEM_LIBXML) @@ -8262,7 +8262,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then AC_MSG_CHECKING([which MariaDB to use]) if test "$with_system_mariadb" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_MARIADB=YES + SYSTEM_MARIADB=TRUE #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config]) if test -z "$MARIADBCONFIG"; then AC_PATH_PROG(MARIADBCONFIG, [mysql_config]) @@ -8314,7 +8314,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then else AC_MSG_RESULT([internal]) AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient]) - SYSTEM_MARIADB=NO + SYSTEM_MARIADB= MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include" MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib" BUILD_TYPE="$BUILD_TYPE MARIADB" |