[sword-svn] r3042 - in trunk: . src/modules/common

[scribe at crosswire.org]

Author: scribe
Date: 2014-03-01 17:18:48 -0700 (Sat, 01 Mar 2014)
New Revision: 3042

Modified:
   trunk/configure.ac
   trunk/src/modules/common/Makefile.am
Log:
fixed conditional compilation for bzip2 and xz


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2014-03-01 17:22:56 UTC (rev 3041)
+++ trunk/configure.ac	2014-03-02 00:18:48 UTC (rev 3042)
@@ -390,7 +390,8 @@
 # ---------------------------------------------------------------------
 
 AM_CONDITIONAL(HAVE_LIBZ, test x$with_zlib = xyes)
-AM_CONDITIONAL(HAVE_BZIP2, test x$with_bzip2 = xyes)
+AM_CONDITIONAL(HAVE_LIBXZ, test x$with_xz = xyes)
+AM_CONDITIONAL(HAVE_LIBBZ2, test x$with_bzip2 = xyes)
 AM_CONDITIONAL(HAVE_ICU, test x$with_icu = xyes)
 AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_icusword = xyes)
 AM_CONDITIONAL(HAVE_VSNPRINTF, test x$have_vsnprintf = xyes)

Modified: trunk/src/modules/common/Makefile.am
===================================================================
--- trunk/src/modules/common/Makefile.am	2014-03-01 17:22:56 UTC (rev 3041)
+++ trunk/src/modules/common/Makefile.am	2014-03-02 00:18:48 UTC (rev 3042)
@@ -5,13 +5,16 @@
 libsword_la_SOURCES += $(commondir)/swcomprs.cpp
 libsword_la_SOURCES += $(commondir)/lzsscomprs.cpp
 
+SWZLIB =
 if HAVE_LIBZ
-SWZLIB =  $(commondir)/zipcomprs.cpp
-SWZLIB += $(commondir)/bz2comprs.cpp
+SWZLIB += $(commondir)/zipcomprs.cpp
+endif
+if HAVE_LIBXZ
 SWZLIB += $(commondir)/xzcomprs.cpp
-else
-SWZLIB =
 endif
+if HAVE_LIBBZ2
+SWZLIB += $(commondir)/bz2comprs.cpp
+endif
 libsword_la_SOURCES += $(SWZLIB)
 libsword_la_SOURCES += $(commondir)/rawverse.cpp
 libsword_la_SOURCES += $(commondir)/rawverse4.cpp