From 1e665e264ead3dedcf83afc950c43a6764a79884 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 3 Apr 2011 23:53:28 +0000
Subject: xz 5.0.2, from http://tukaani.org/xz/xz-5.0.2.tar.xz

git-svn-id: svn://tug.org/texlive/trunk@21944 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/extra/xz/debug/Makefile.am |  5 +----
 Build/source/extra/xz/debug/Makefile.in | 11 ++++-------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'Build/source/extra/xz/debug')

diff --git a/Build/source/extra/xz/debug/Makefile.am b/Build/source/extra/xz/debug/Makefile.am
index 23834f4fcac..45b4b7fd780 100644
--- a/Build/source/extra/xz/debug/Makefile.am
+++ b/Build/source/extra/xz/debug/Makefile.am
@@ -16,10 +16,7 @@ noinst_PROGRAMS = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/common \
-	-I$(top_srcdir)/src/liblzma/api \
-	$(STATIC_CPPFLAGS)
-
-AM_LDFLAGS = $(STATIC_LDFLAGS)
+	-I$(top_srcdir)/src/liblzma/api
 
 LDADD = $(top_builddir)/src/liblzma/liblzma.la
 
diff --git a/Build/source/extra/xz/debug/Makefile.in b/Build/source/extra/xz/debug/Makefile.in
index 7634ccbdd7d..2d7b6fad8ec 100644
--- a/Build/source/extra/xz/debug/Makefile.in
+++ b/Build/source/extra/xz/debug/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
 	$(top_srcdir)/m4/tuklib_cpucores.m4 \
 	$(top_srcdir)/m4/tuklib_integer.m4 \
+	$(top_srcdir)/m4/tuklib_mbstr.m4 \
 	$(top_srcdir)/m4/tuklib_physmem.m4 \
 	$(top_srcdir)/m4/tuklib_progname.m4 \
 	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
@@ -142,8 +143,6 @@ DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DYNAMIC_CPPFLAGS = @DYNAMIC_CPPFLAGS@
-DYNAMIC_LDFLAGS = @DYNAMIC_LDFLAGS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -176,6 +175,7 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -205,8 +205,6 @@ RC = @RC@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STATIC_CPPFLAGS = @STATIC_CPPFLAGS@
-STATIC_LDFLAGS = @STATIC_LDFLAGS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -216,6 +214,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -267,10 +266,8 @@ top_srcdir = @top_srcdir@
 xz = @xz@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/common \
-	-I$(top_srcdir)/src/liblzma/api \
-	$(STATIC_CPPFLAGS)
+	-I$(top_srcdir)/src/liblzma/api
 
-AM_LDFLAGS = $(STATIC_LDFLAGS)
 LDADD = $(top_builddir)/src/liblzma/liblzma.la $(am__append_1) \
 	$(LTLIBINTL)
 all: all-am
-- 
cgit v1.2.3