diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:33:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
| commit | 46648159bfc18cf29196ae8eba5a64decf10c45b (patch) | |
| tree | 22d5e9a0fc52b2e2c321bf9451df0417ac817ba1 /configure.ac | |
| parent | 04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9 (diff) | |
normalize values of SYSTEM_CLUCENE, SYSTEM_EXPAT, SYSTEM_JPEG
Change-Id: I343dae79b01e1369722c7bbd1ab2c36e2bfa96ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 2f3c87dd96c3..4fecc7b5327a 100644 --- a/configure.ac +++ b/configure.ac @@ -7700,7 +7700,7 @@ fi if test "$with_system_jpeg" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_JPEG=YES + SYSTEM_JPEG=TRUE AC_CHECK_HEADER(jpeglib.h, [], [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], []) AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ], @@ -7708,7 +7708,7 @@ if test "$with_system_jpeg" = "yes"; then libo_MINGW_CHECK_DLL([libjpeg]) else AC_MSG_RESULT([internal]) - SYSTEM_JPEG=NO + SYSTEM_JPEG= BUILD_TYPE="$BUILD_TYPE JPEG" fi AC_SUBST(SYSTEM_JPEG) @@ -7723,7 +7723,7 @@ dnl but the contribs-lib check seems tricky AC_MSG_CHECKING([which clucene to use]) if test "$with_system_clucene" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_CLUCENE=YES + SYSTEM_CLUCENE=TRUE PKG_CHECK_MODULES(CLUCENE, libclucene-core) CLUCENE_CFLAGS=[$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 's@-I[^ ]*/CLucene/ext@@' -e "s/-I/${ISYSTEM?}/g")] AC_LANG_PUSH([C++]) @@ -7742,7 +7742,7 @@ if test "$with_system_clucene" = "yes"; then CLUCENE_LIBS="$CLUCENE_LIBS -lclucene-contribs-lib" else AC_MSG_RESULT([internal]) - SYSTEM_CLUCENE=NO + SYSTEM_CLUCENE= BUILD_TYPE="$BUILD_TYPE CLUCENE" fi AC_SUBST(SYSTEM_CLUCENE) @@ -7757,7 +7757,7 @@ dnl proper pkg-config for it. It should really be fixed on the tinderbox though. AC_MSG_CHECKING([which expat to use]) if test "$with_system_expat" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_EXPAT=YES + SYSTEM_EXPAT=TRUE AC_CHECK_HEADER(expat.h, [], [AC_MSG_ERROR(expat.h not found. install expat)], []) AC_CHECK_LIB([expat], [XML_ParserCreate], [:], @@ -7765,7 +7765,7 @@ if test "$with_system_expat" = "yes"; then libo_MINGW_CHECK_DLL([libexpat]) else AC_MSG_RESULT([internal]) - SYSTEM_EXPAT=NO + SYSTEM_EXPAT= BUILD_TYPE="$BUILD_TYPE EXPAT" fi AC_SUBST(SYSTEM_EXPAT) |