diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 13:28:48 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 19:59:29 +0000 |
| commit | c871c0695cd4683327188d9c7e4daeba7d55d795 (patch) | |
| tree | 142d2be15105dfbb74c0ded13b0c045f0a9f32a3 | |
| parent | ac5f2f3481a318cadd7c59e7ea89401f81e9a259 (diff) | |
ENABLE_MEDIAWIKI Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I4561c2cd3b937cbd0085d1e94930d5f458281d11
Reviewed-on: https://gerrit.libreoffice.org/5704
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | swext/Module_swext.mk | 2 | ||||
| -rw-r--r-- | xsltml/Module_xsltml.mk | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index b2ab0ef12792..eecd4d4911a0 100644 --- a/configure.ac +++ b/configure.ac @@ -10281,19 +10281,19 @@ AC_SUBST(POPPLER_LIBS) AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then AC_MSG_RESULT([yes]) - ENABLE_MEDIAWIKI=YES + ENABLE_MEDIAWIKI=TRUE BUILD_TYPE="$BUILD_TYPE XSLTML" if test "x$with_java" = "xno"; then AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.]) fi else AC_MSG_RESULT([no]) - ENABLE_MEDIAWIKI=NO + ENABLE_MEDIAWIKI= SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI" fi AC_SUBST(ENABLE_MEDIAWIKI) -if test "$ENABLE_MEDIAWIKI" = "YES"; then +if test "$ENABLE_MEDIAWIKI" = "TRUE"; then AC_MSG_CHECKING([which Servlet API Jar to use]) if test "$with_system_servlet_api" = "yes"; then AC_MSG_RESULT([external]) @@ -10506,12 +10506,12 @@ AC_SUBST(LIBSERIALIZER_JAR) # this has to be here because both the Wiki Publisher and the SRB use # commons-logging -if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then +if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES AC_MSG_RESULT([external]) - if test "$ENABLE_MEDIAWIKI" = "YES"; then + if test "$ENABLE_MEDIAWIKI" = "TRUE"; then if test -z $COMMONS_CODEC_JAR; then AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar, [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ], @@ -10557,7 +10557,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) fi fi - if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then + if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then if test -z $COMMONS_LOGGING_JAR; then AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], @@ -11800,7 +11800,7 @@ EOF AC_MSG_ERROR([no, you need at least Ant >= $ant_minver]) fi - if test "$ENABLE_MEDIAWIKI" = "YES"; then + if test "$ENABLE_MEDIAWIKI" = "TRUE"; then AC_MSG_CHECKING([whether Ant supports mapper type="regexp"]) rm -rf confdir mkdir confdir diff --git a/swext/Module_swext.mk b/swext/Module_swext.mk index 0d48229bd246..0a5462c18f58 100644 --- a/swext/Module_swext.mk +++ b/swext/Module_swext.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,swext)) -ifeq ($(ENABLE_MEDIAWIKI),YES) +ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,swext,\ Jar_mediawiki \ Configuration_mediawiki \ diff --git a/xsltml/Module_xsltml.mk b/xsltml/Module_xsltml.mk index 68de9f2d7177..2f2bd1279530 100644 --- a/xsltml/Module_xsltml.mk +++ b/xsltml/Module_xsltml.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,xsltml)) -ifeq ($(ENABLE_MEDIAWIKI),YES) +ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,xsltml,\ ExternalPackage_xsltml \ |