[Libreoffice-commits] core.git: liblangtag/ExternalProject_langtag.mk

[Stephan Bergmann]

 liblangtag/ExternalProject_langtag.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c03448ddbb11d96e0c9985ddfaa4f2c5d6cd426e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 14 11:33:56 2013 +0100

    Make liblangtag build for --without-system-libxml again, at least on Linux
    
    ...after 83d61d9f1b0c95de2cd1199d3f60be70dfa92bec "move liblangtag to
    gcc-wrapper."
    
    Change-Id: I5c9321bf4cafb5e6c1a078162ce3cc5f73540ce5

diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index 6f6923c..22e35c6 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 		./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
 		$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		$(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML2_LIBS=" ",\
+		$(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML2_LIBS="-L$(gb_Helper_OUTDIRLIBDIR) -lxml2",\
 		$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \
 		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \