From ac9feeaed59568c20ff7d91974d984289e5be8a6 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 3 Feb 2005 15:38:04 +0000 Subject: [PATCH] Make -lz conditional on USE_COMPRESSION. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9583 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/ChangeLog | 4 ++++ src/tex2lyx/Makefile.am | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog index e021fa0ecc..a87da6af1f 100644 --- a/src/tex2lyx/ChangeLog +++ b/src/tex2lyx/ChangeLog @@ -1,3 +1,7 @@ +2005-02-03 Angus Leeming + + * Makefile.am: make -lz conditional on USE_COMPRESSION. + 2005-02-03 Georg Baum * text.C (parse_text): handle \includegraphics* diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 65f07cd517..c7bcab1d88 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -17,6 +17,10 @@ AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM) +if USE_COMPRESSION +COMPRESSIONLIB = -lz +endif + BUILT_SOURCES = \ FloatList.C \ Floating.C \ @@ -50,7 +54,7 @@ tex2lyx_SOURCES = \ tex2lyx_LDADD = \ $(top_builddir)/src/support/libsupport.la \ - $(BOOST_LIBS) -lz + $(BOOST_LIBS) $(COMPRESSIONLIB) $(BUILT_SOURCES) : @rm -f $@ ; \