mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move setup of HUNSPELL_CFLAGS etc. to configure

Browse Source 
Change-Id: Id50ca2e0804d9e56334c9f7149dc4080a7fee729
This commit is contained in:
Michael Stahl
2012-10-29 12:02:36 +01:00
parent cda6b4e991
commit 67a23b6af9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -8840,6 +8840,8 @@ if test "$with_system_hunspell" = "yes"; then
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO 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" HUNSPELL_TARBALL="3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz"
BUILD_TYPE="$BUILD_TYPE HUNSPELL" BUILD_TYPE="$BUILD_TYPE HUNSPELL"
fi fi

6
mythes/ExternalProject_mythes.mk
View File

@@ -21,10 +21,8 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
cd $(EXTERNAL_WORKDIR) \ cd $(EXTERNAL_WORKDIR) \
&& ./configure --disable-shared --with-pic \ && ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
$(if $(filter NO,$(SYSTEM_HUNSPELL)), \ HUNSPELL_CFLAGS=" $(HUNSPELL_CFLAGS)" \
HUNSPELL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)" \ HUNSPELL_LIBS=" $(HUNSPELL_LIBS)" \
HUNSPELL_LIBS="-L$(OUTDIR)/lib -lhunspell" \
) \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \ $(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
&& $(GNUMAKE) -j$(EXTMAXPROCESS) \ && $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& touch $@ && touch $@