[Libreoffice-commits] .: liblangtag/ExternalProject_langtag.mk liblangtag/liblangtag-0.4.0-msc-configure.patch

[Libreoffice Gerrit user]

 liblangtag/ExternalProject_langtag.mk           |    5 ++---
 liblangtag/liblangtag-0.4.0-msc-configure.patch |    9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 661d5a479c7c7340a4b33d7d01ee0c5d03a6e6b3
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Nov 13 20:43:24 2012 -0500

    fix liblangtag for win and cleanup autoconf
    
    Change-Id: I6d69eb2af6a3b1a693ad782f2a0e51f6b0ef932c

diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index 01744cd..d23f5e3 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -22,9 +22,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 		CC="$(CC) -MD -nologo \
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),-Zi) \
 			$(SOLARINC)") \
-	&& echo \
-	    $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") >> config.cache \
-	&& ./configure -C --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
+	&& ./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$(OUTDIR)/inc/external" \
 	$(if $(filter MSC,$(COM)),LIBXML2_LIBS="$(OUTDIR)/lib/libxml2.lib",LIBXML2_LIBS="-L$(OUTDIR)/lib -lxml2"),\
diff --git a/liblangtag/liblangtag-0.4.0-msc-configure.patch b/liblangtag/liblangtag-0.4.0-msc-configure.patch
index db49ade..7c042a0 100644
--- a/liblangtag/liblangtag-0.4.0-msc-configure.patch
+++ b/liblangtag/liblangtag-0.4.0-msc-configure.patch
@@ -32,6 +32,15 @@
  	$(NULL)
 --- misc/liblangtag-0.4.0/data/Makefile.in	2012-10-22 05:47:23.000000000 +0200
 +++ misc/build/liblangtag-0.4.0/data/Makefile.in	2012-11-06 14:47:23.173704887 +0100
+@@ -52,7 +52,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = reg2xml$(EXEEXT) $(am__EXEEXT_1)
++noinst_PROGRAMS = $(am__EXEEXT_1)
+ subdir = data
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 @@ -80,8 +80,8 @@
  am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
  am__v_lt_0 = --silent