From: Michael Schroeder <mls@suse.de>
Date: Mon, 26 Mar 2012 13:02:49 +0000 (+0200)
Subject: - rename to ENABLE_LZMA_COMPRESSION as the lib is called lzma
X-Git-Tag: BASE-SuSE-Code-12_2-Branch~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec833a5377d8da8091da80ec71650cc34e931ff;p=thirdparty%2Flibsolv.git

- rename to ENABLE_LZMA_COMPRESSION as the lib is called lzma
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69497fc1..4540fa60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ OPTION (ENABLE_HELIXREPO "Build with helix repository support?" OFF)
 OPTION (ENABLE_DEBIAN "Build with debian database/repository support?" OFF)
 OPTION (ENABLE_MDKREPO "Build with mandriva/mageia repository support?" OFF)
 
-OPTION (ENABLE_XZ_COMPRESSION "Build with xz/lzma compression support?" OFF)
+OPTION (ENABLE_LZMA_COMPRESSION "Build with lzma/xz compression support?" OFF)
 
 #IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4)
 #ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4)
@@ -136,7 +136,7 @@ TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
 # should create config.h with #cmakedefine instead...
 FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
   ENABLE_RPMDB ENABLE_RPMDB_PUBKEY ENABLE_RPMMD ENABLE_SUSEREPO ENABLE_COMPS
-  ENABLE_HELIXREPO ENABLE_MDKREPO ENABLE_DEBIAN ENABLE_XZ_COMPRESSION)
+  ENABLE_HELIXREPO ENABLE_MDKREPO ENABLE_DEBIAN ENABLE_LZMA_COMPRESSION)
   IF(${VAR})
     ADD_DEFINITIONS (-D${VAR}=1)
     SET (SWIG_FLAGS ${SWIG_FLAGS} -D${VAR})
diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
index 9d94e01f..8dd9dd7c 100644
--- a/ext/solv_xfopen.c
+++ b/ext/solv_xfopen.c
@@ -75,7 +75,7 @@ static inline FILE *mygzfdopen(int fd, const char *mode)
 }
 
 
-#ifdef ENABLE_XZ_COMPRESSION
+#ifdef ENABLE_LZMA_COMPRESSION
 
 #include <lzma.h>
 
@@ -249,7 +249,7 @@ static inline FILE *mylzfdopen(int fd, const char *mode)
   return cookieopen(lzf, mode, lzread, lzwrite, lzclose);
 }
 
-#endif /* ENABLE_XZ_COMPRESSION */
+#endif /* ENABLE_LZMA_COMPRESSION */
 
 
 FILE *
@@ -264,7 +264,7 @@ solv_xfopen(const char *fn, const char *mode)
   suf = strrchr(fn, '.');
   if (suf && !strcmp(suf, ".gz"))
     return mygzfopen(fn, mode);
-#ifdef ENABLE_XZ_COMPRESSION
+#ifdef ENABLE_LZMA_COMPRESSION
   if (suf && !strcmp(suf, ".xz"))
     return myxzfopen(fn, mode);
   if (suf && !strcmp(suf, ".lzma"))
@@ -299,7 +299,7 @@ solv_xfopen_fd(const char *fn, int fd, const char *mode)
     }
   if (suf && !strcmp(suf, ".gz"))
     return mygzfdopen(fd, mode);
-#ifdef ENABLE_XZ_COMPRESSION
+#ifdef ENABLE_LZMA_COMPRESSION
   if (suf && !strcmp(suf, ".xz"))
     return myxzfdopen(fd, mode);
   if (suf && !strcmp(suf, ".lzma"))