Change-Id: Iaf2180946186e9490840ebbdd5f948a31103dc4f
This commit is contained in:
Matúš Kukan 2012-09-09 16:29:10 +02:00
parent e6812db65e
commit a2d63fe0c0
3 changed files with 5 additions and 7 deletions

View file

@ -1880,9 +1880,9 @@ ifeq ($(SYSTEM_LIBORCUS),YES)
define gb_LinkTarget__use_orcus
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBORCUS_CFLAGS) \
$(ORCUS_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LIBORCUS_LIBS))
$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS))
endef

View file

@ -534,6 +534,7 @@ export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
@ -557,7 +558,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@
export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
export SYSTEM_ORCUS=@SYSTEM_ORCUS@
export SYSTEM_PANGO=@SYSTEM_PANGO@
export SYSTEM_POPPLER=@SYSTEM_POPPLER@
export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@

View file

@ -8607,8 +8607,6 @@ AC_MSG_CHECKING([which orcus library to use])
if test "$with_system_orcus" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBORCUS=YES
LIBORCUS_CFLAGS="`$PKG_CONFIG --cflags liborcus-0.2`"
LIBORCUS_LIBS="`$PKG_CONFIG --libs liborcus-0.2`"
PKG_CHECK_MODULES(ORCUS, orcus >= 0.1.0)
else
AC_MSG_RESULT([internal])
@ -8617,9 +8615,9 @@ else
SYSTEM_LIBORCUS=NO
fi
AC_SUBST(SYSTEM_LIBORCUS)
AC_SUBST(ORCUS_CFLAGS)
AC_SUBST(ORCUS_LIBS)
AC_SUBST(ORCUS_TARBALL)
AC_SUBST(LIBORCUS_CFLAGS)
AC_SUBST(LIBORCUS_LIBS)
dnl ===================================================================
dnl Check for system hunspell