[Libreoffice-commits] .: config_host.mk.in configure.in RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |    4 ++--
 config_host.mk.in     |    2 +-
 configure.in          |    6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit a2d63fe0c0a476700b2e76012777b5bd2c9f1df7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Sep 9 16:29:10 2012 +0200

    fix typo
    
    Change-Id: Iaf2180946186e9490840ebbdd5f948a31103dc4f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 420332a..82c6b17 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -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
 
diff --git a/config_host.mk.in b/config_host.mk.in
index d7e0440..1d493e2 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -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@
diff --git a/configure.in b/configure.in
index b900cd5..8232093 100644
--- a/configure.in
+++ b/configure.in
@@ -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