strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENABLE_MEDIAWIKI Harmonize ENABLE_* variable to TRUE/<nothing>

Browse source 
Change-Id: I4561c2cd3b937cbd0085d1e94930d5f458281d11
Reviewed-on: https://gerrit.libreoffice.org/5704
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud 2013-08-30 13:28:48 -05:00
parent ac5f2f3481
commit c871c0695c
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -10281,19 +10281,19 @@ AC_SUBST(POPPLER_LIBS)
AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) 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 if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_MEDIAWIKI=YES ENABLE_MEDIAWIKI=TRUE
BUILD_TYPE="$BUILD_TYPE XSLTML" BUILD_TYPE="$BUILD_TYPE XSLTML"
if test "x$with_java" = "xno"; then if test "x$with_java" = "xno"; then
AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.]) AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
fi fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_MEDIAWIKI=NO ENABLE_MEDIAWIKI=
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI" SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
fi fi
AC_SUBST(ENABLE_MEDIAWIKI) 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]) AC_MSG_CHECKING([which Servlet API Jar to use])
if test "$with_system_servlet_api" = "yes"; then if test "$with_system_servlet_api" = "yes"; then
AC_MSG_RESULT([external]) 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 # this has to be here because both the Wiki Publisher and the SRB use
# commons-logging # 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]) AC_MSG_CHECKING([which Apache commons-* libs to use])
if test "$with_system_apache_commons" = "yes"; then if test "$with_system_apache_commons" = "yes"; then
SYSTEM_APACHE_COMMONS=YES SYSTEM_APACHE_COMMONS=YES
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then if test "$ENABLE_MEDIAWIKI" = "TRUE"; then
if test -z $COMMONS_CODEC_JAR; then if test -z $COMMONS_CODEC_JAR; then
AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar, AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar,
[ COMMONS_CODEC_JAR=/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.)], []) [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
fi fi
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 if test -z $COMMONS_LOGGING_JAR; then
AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
[ COMMONS_LOGGING_JAR=/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]) AC_MSG_ERROR([no, you need at least Ant >= $ant_minver])
fi fi
if test "$ENABLE_MEDIAWIKI" = "YES"; then if test "$ENABLE_MEDIAWIKI" = "TRUE"; then
AC_MSG_CHECKING([whether Ant supports mapper type="regexp"]) AC_MSG_CHECKING([whether Ant supports mapper type="regexp"])
rm -rf confdir rm -rf confdir
mkdir confdir mkdir confdir

2
swext/Module_swext.mk
View file

@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,swext)) $(eval $(call gb_Module_Module,swext))
ifeq ($(ENABLE_MEDIAWIKI),YES) ifeq ($(ENABLE_MEDIAWIKI),TRUE)
$(eval $(call gb_Module_add_targets,swext,\ $(eval $(call gb_Module_add_targets,swext,\
Jar_mediawiki \ Jar_mediawiki \
Configuration_mediawiki \ Configuration_mediawiki \

2
xsltml/Module_xsltml.mk
View file

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,xsltml)) $(eval $(call gb_Module_Module,xsltml))
ifeq ($(ENABLE_MEDIAWIKI),YES) ifeq ($(ENABLE_MEDIAWIKI),TRUE)
$(eval $(call gb_Module_add_targets,xsltml,\ $(eval $(call gb_Module_add_targets,xsltml,\
ExternalPackage_xsltml \ ExternalPackage_xsltml \