diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:42:28 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:12 +0100 |
| commit | 49dde4cd421181021e2d211514788b495b94c95b (patch) | |
| tree | 4466cc47cc1a203bab76f1047f41253e25f4ba47 /configure.ac | |
| parent | 7d2f7c6d7eab19fd8d692ed0f162c70103b091f0 (diff) | |
normalize values of SYSTEM_RHINO, SYSTEM_LIBLANGTAG
Change-Id: I656e90024d35ef8189727e6a39815ef4e4fb330b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 50094222dfd8..e21d49ea65b2 100644 --- a/configure.ac +++ b/configure.ac @@ -10876,7 +10876,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then AC_MSG_CHECKING([which rhino to use]) if test "$with_system_rhino" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_RHINO=YES + SYSTEM_RHINO=TRUE if test -z $RHINO_JAR; then RHINO_JAR=/usr/share/java/js.jar fi @@ -10884,7 +10884,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then [AC_MSG_ERROR(js.jar not found.)], []) else AC_MSG_RESULT([internal]) - SYSTEM_RHINO=NO + SYSTEM_RHINO= BUILD_TYPE="$BUILD_TYPE RHINO" fi else @@ -11870,13 +11870,13 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != AC_MSG_RESULT([yes]) AC_MSG_CHECKING([whether to use system liblangtag]) if test "$with_system_liblangtag" = yes; then - SYSTEM_LIBLANGTAG=YES + SYSTEM_LIBLANGTAG=TRUE AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0) LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") libo_MINGW_CHECK_DLL([liblangtag]) else - SYSTEM_LIBLANGTAG=NO + SYSTEM_LIBLANGTAG= AC_MSG_RESULT([no]) BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" if test "$COM" = "MSC"; then |