[Libreoffice-commits] .: configure.ac mythes/ExternalProject_mythes.mk

[Libreoffice Gerrit user]

 configure.ac                     |    2 ++
 mythes/ExternalProject_mythes.mk |    6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 67a23b6af991d383de5d431db9cc88d18f488b7c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 29 12:02:36 2012 +0100

    move setup of HUNSPELL_CFLAGS etc. to configure
    
    Change-Id: Id50ca2e0804d9e56334c9f7149dc4080a7fee729

diff --git a/configure.ac b/configure.ac
index 276e991..d53c6a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8840,6 +8840,8 @@ if test "$with_system_hunspell" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_HUNSPELL=NO
+    HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell"
+    HUNSPELL_LIBS="-L${OUTDIR}/lib -lhunspell"
     HUNSPELL_TARBALL="3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz"
     BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 1d2ab7b..b146823 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -21,10 +21,8 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
 	cd $(EXTERNAL_WORKDIR) \
 	&& ./configure --disable-shared --with-pic \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
-	$(if $(filter NO,$(SYSTEM_HUNSPELL)), \
-		HUNSPELL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)" \
-		HUNSPELL_LIBS="-L$(OUTDIR)/lib -lhunspell" \
-	) \
+	HUNSPELL_CFLAGS=" $(HUNSPELL_CFLAGS)" \
+	HUNSPELL_LIBS=" $(HUNSPELL_LIBS)" \
 	$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
 	&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
 	&& touch $@