diff options
| -rw-r--r-- | config_host.mk.in | 22 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index b53794f4ceae..75cce05fc974 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -17,7 +17,7 @@ export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@" export BSH_JAR="@BSH_JAR@" export BUILD_DMAKE="@BUILD_DMAKE@" export BUILD_EPM="@BUILD_EPM@" -@x_MOZ@ export BUILD_MOZAB="@BUILD_MOZAB@" +export BUILD_MOZAB="@BUILD_MOZAB@" export BUILD_NCPUS="@BUILD_NCPUS@" export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@" export BUILD_STAX="@BUILD_STAX@" @@ -51,7 +51,7 @@ export DBUS_CFLAGS="@DBUS_CFLAGS@" export DBUS_LIBS="@DBUS_LIBS@" export DB_CPPLIB="@DB_CPPLIB@" export DB_LIB="@DB_LIB@" -@x_MOZ@ export DEFAULT_MOZILLA_TOOLKIT="@MOZILLA_TOOLKIT@" +export DEFAULT_MOZILLA_TOOLKIT="@MOZILLA_TOOLKIT@" export DEFAULT_TO_ENGLISH_FOR_PACKING="yes" export DIAGRAM_EXTENSION_PACK="@DIAGRAM_EXTENSION_PACK@" export DICT_SYSTEM_DIR="@DICT_SYSTEM_DIR@" @@ -206,14 +206,14 @@ export MKDEPENDSOLVER="TRUE" export ML_EXE="@ML_EXE@" export MOC4="@MOC4@" export MOC="@MOC@" -@x_MOZ@ export MOZILLABUILD="@MOZILLABUILD@" -@x_MOZ@ export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@" -@x_MOZ@ export MOZILLA_VERSION="@MOZILLA_VERSION@" -@x_MOZ@ export MOZ_FLAVOUR="@MOZ_FLAVOUR@" -@x_MOZ@ export MOZ_INC="@MOZ_INC@" -@x_MOZ@ export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@" -@x_MOZ@ export MOZ_LIB="@MOZ_LIB@" -@x_MOZ@ export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@" +export MOZILLABUILD="@MOZILLABUILD@" +export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@" +export MOZILLA_VERSION="@MOZILLA_VERSION@" +export MOZ_FLAVOUR="@MOZ_FLAVOUR@" +export MOZ_INC="@MOZ_INC@" +export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@" +export MOZ_LIB="@MOZ_LIB@" +export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@" export MYSQL_DEFINES="@MYSQL_DEFINES@" export MYSQL_INC="@MYSQL_INC@" export MYSQL_LIB="@MYSQL_LIB@" @@ -250,7 +250,7 @@ export POPPLER_CFLAGS="@POPPLER_CFLAGS@" export POPPLER_LIBS="@POPPLER_LIBS@" export POSTGRESQL_INC="@POSTGRESQL_INC@" export POSTGRESQL_LIB="@POSTGRESQL_LIB@" -@x_MOZ@ export PREBUILD_MOZAB="@PREBUILD_MOZAB@" +export PREBUILD_MOZAB="@PREBUILD_MOZAB@" export PREFIXDIR="@PREFIXDIR@" export PRODUCT="@PRODUCT@" export PRODUCTNAME="@PRODUCTNAME@" diff --git a/configure.in b/configure.in index fab7cfc78444..cc40ed9009d4 100644 --- a/configure.in +++ b/configure.in @@ -6371,7 +6371,6 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.]) elif test "$enable_mozilla" = "no"; then AC_MSG_RESULT([none]) - x_MOZ=[\#] WITH_MOZILLA=NO else AC_MSG_RESULT([internal]) @@ -6536,7 +6535,6 @@ These files can be found at <http://dev-www.libreoffice.org/mozilla/> fi fi fi -AC_SUBST(x_MOZ) AC_SUBST(BUILD_MOZAB) AC_SUBST(PREBUILT_MOZAB) AC_SUBST(MOZILLABUILD) |