configure.ac | 32 ++++++++++++++++------------ python3/ExternalProject_python3.mk | 4 +-- sdext/source/pdfimport/xpdftest/makefile.mk | 2 - 3 files changed, 22 insertions(+), 16 deletions(-)
New commits: commit d79f3e6ff03722db0dd082aecc3e3e6e29cfbb4f Author: Tor Lillqvist <[email protected]> Date: Thu Oct 10 09:55:31 2013 +0300 Normalize ENABLE_VALGRIND: TRUE or empty Change-Id: I21521d1d7e4a139a1ea0c3f4fe6c51b4637c595f diff --git a/configure.ac b/configure.ac index 3b8cda6..a917cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -5524,17 +5524,18 @@ AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT8,$SAL_TYPES_ALIGNMENT8) dnl =================================================================== dnl Check if valgrind headers are available dnl =================================================================== -if test "$cross_compiling" = yes; then - ENABLE_VALGRIND=FALSE -else +ENABLE_VALGRIND= +if test "$cross_compiling" != yes; then prev_cppflags=$CPPFLAGS + # Is VALGRIND_CFLAGS something one is supposed to have in the environment, + # or where does it come from? CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS" AC_CHECK_HEADER([valgrind/valgrind.h], - [ENABLE_VALGRIND=TRUE],[ENABLE_VALGRIND=FALSE]) + [ENABLE_VALGRIND=TRUE]) CPPFLAGS=$prev_cppflags fi AC_SUBST([ENABLE_VALGRIND]) -if test "$ENABLE_VALGRIND" = FALSE; then +if test -z "$ENABLE_VALGRIND"; then VALGRIND_CFLAGS= fi AC_SUBST([VALGRIND_CFLAGS]) diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 3abf24a..8e7769b 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -52,7 +52,7 @@ else # specific name like build/lib.linux-x86_64-3.3 python3_cflags = $(ZLIB_CFLAGS) -ifeq ($(ENABLE_VALGRIND),TRUE) +ifneq (,$(ENABLE_VALGRIND)) python3_cflags += $(VALGRIND_CFLAGS) endif @@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ + $(if $(ENABLE_VALGRIND),--with-valgrind) \ --prefix=/python-inst \ $(if $(filter MACOSX,$(OS)),,--with-system-expat) \ $(if $(filter AIX,$(OS)), \ commit 85f5f2301d2efaa3246d7dde87c5e3a969711140 Author: Tor Lillqvist <[email protected]> Date: Thu Oct 10 09:41:26 2013 +0300 Untabify Change-Id: I8cd9246f9f8866ebbf19455b00cfadee5db8354a diff --git a/configure.ac b/configure.ac index 8055dae..3b8cda6 100644 --- a/configure.ac +++ b/configure.ac @@ -10036,10 +10036,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then AC_MSG_RESULT([external]) AC_CHECK_HEADER(bluetooth/bluetooth.h, [], [AC_MSG_ERROR(bluetooth.h not found. install bluez)], []) - SYSTEM_BLUEZ=YES + SYSTEM_BLUEZ=YES else AC_MSG_RESULT([internal]) - SYSTEM_BLUEZ=NO + SYSTEM_BLUEZ=NO fi else AC_MSG_RESULT([no, dbus disabled]) commit 46ddcbbe2a4b2e97770f2c962c6450a48f539cd9 Author: Tor Lillqvist <[email protected]> Date: Thu Oct 10 09:38:58 2013 +0300 Normalize ENABLE_PDFIMPORT: TRUE or empty Change-Id: I962b37757dbf3569df73e70ae2d7c666d7cdf43e diff --git a/configure.ac b/configure.ac index f6c0c01..8055dae 100644 --- a/configure.ac +++ b/configure.ac @@ -773,6 +773,11 @@ AC_ARG_ENABLE(lpsolve, [Disable compilation of the lp solve solver ]) ) +AC_ARG_ENABLE(pdfimport, + AS_HELP_STRING([--disable-pdfimport], + [Disable building the PDF import feature.]) +) + ############################################################################### dnl ---------- *** ---------- @@ -4514,11 +4519,11 @@ if test "$cross_compiling" = "yes"; then # Don't bother having configure look for stuff not needed for the build platform anyway ./configure \ --disable-graphite \ + --disable-pdfimport \ --disable-postgresql-sdbc \ --with-parallelism="$with_parallelism" \ --without-doxygen \ --without-java \ - ENABLE_PDFIMPORT=FALSE \ $sub_conf_opts \ --srcdir=$srcdir \ 2>&1 | sed -e 's/^/ /' @@ -10347,15 +10352,16 @@ fi AC_SUBST(ENABLE_MINIMIZER) # pdf import? -AC_MSG_CHECKING([whether to build the PDF import]) -if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then +AC_MSG_CHECKING([whether to build the PDF import feature]) +ENABLE_PDFIMPORT= +if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then AC_MSG_RESULT([yes]) ENABLE_PDFIMPORT=TRUE dnl =================================================================== dnl Check for system poppler dnl =================================================================== - AC_MSG_CHECKING([which pdf backend to use]) + AC_MSG_CHECKING([which PDF import backend to use]) if test "$with_system_poppler" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES @@ -10379,7 +10385,6 @@ if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then fi else AC_MSG_RESULT([no]) - ENABLE_PDFIMPORT=FALSE fi AC_SUBST(ENABLE_PDFIMPORT) AC_SUBST(SYSTEM_POPPLER) @@ -12492,7 +12497,7 @@ if test "$enable_mpl_subset" = "yes"; then if test "x$enable_ext_mariadb_connector" = "xyes"; then AC_MSG_ERROR([need to --disable-ext-mariadb-connector - mariadb/mysql support.]) fi - if test "x$ENABLE_PDFIMPORT" != "xFALSE"; then + if test -n "$ENABLE_PDFIMPORT"; then if test "x$SYSTEM_POPPLER" != "xNO"; then AC_MSG_ERROR([need to disable PDF import via poppler or use system library]) fi diff --git a/sdext/source/pdfimport/xpdftest/makefile.mk b/sdext/source/pdfimport/xpdftest/makefile.mk index bb9fed8..84d26dd 100644 --- a/sdext/source/pdfimport/xpdftest/makefile.mk +++ b/sdext/source/pdfimport/xpdftest/makefile.mk @@ -26,7 +26,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE: settings.mk -.IF "$(ENABLE_PDFIMPORT)" == "FALSE" +.IF "$(ENABLE_PDFIMPORT)" != "TRUE" @all: @echo "PDF Import extension disabled." .ENDIF _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
