From 880c3309386aac58fc4f3d7ca99bd31bcb1526a3 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 7 Feb 2009 21:17:07 +0200 Subject: Make it easy to choose if command line tools should be linked statically or dynamically against liblzma. The default is still to use static liblzma, but it can now be changed by passing --enable-dynamic to configure. Thanks to Mike Frysinger for the original patch. Fixed a few minor bugs in configure.ac. --- src/xz/Makefile.am | 8 +++----- src/xzdec/Makefile.am | 5 +++-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/xz/Makefile.am b/src/xz/Makefile.am index 5deed299..02dd8357 100644 --- a/src/xz/Makefile.am +++ b/src/xz/Makefile.am @@ -42,12 +42,10 @@ xz_CPPFLAGS = \ -I@top_srcdir@/src/common \ -I@top_srcdir@/src/liblzma/api \ -I@top_builddir@/lib \ - -I@top_srcdir@/lib + -I@top_srcdir@/lib \ + @STATIC_CPPFLAGS@ -## Always link the command line tool statically against liblzma. It is -## faster on x86, because no need for PIC. We also have one dependency less, -## which allows users to more freely copy the xz binary to other boxes. -xz_LDFLAGS = -static +xz_LDFLAGS = @STATIC_LDFLAGS@ xz_LDADD = \ @top_builddir@/src/liblzma/liblzma.la \ @LTLIBINTL@ diff --git a/src/xzdec/Makefile.am b/src/xzdec/Makefile.am index 84183fc0..0f85e4e8 100644 --- a/src/xzdec/Makefile.am +++ b/src/xzdec/Makefile.am @@ -18,8 +18,9 @@ xzdec_SOURCES = xzdec.c xzdec_CPPFLAGS = \ -I@top_srcdir@/src/common \ -I@top_srcdir@/src/liblzma/api \ - -I@top_builddir@/lib -xzdec_LDFLAGS = -static + -I@top_builddir@/lib \ + @STATIC_CPPFLAGS@ +xzdec_LDFLAGS = @STATIC_LDFLAGS@ xzdec_LDADD = \ @top_builddir@/src/liblzma/liblzma.la \ @LTLIBINTL@ -- cgit v1.2.3