Sorted library mess

2 files changed, 41 insertions, 33 deletions

diff --git a/Makefile.am b/Makefile.am
index f7b9c168..8897ec94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ lib_LTLIBRARIES = libapt-pkg.la libapt-inst.la libapt-private.la
 
 
 # === libapt-pkg ===
-libapt_pkg_la_LIBADD   = $(LTLIBICONV) -lz -lbz2 -lgnu
+libapt_pkg_la_LIBADD   = $(LTLIBICONV) $(LIBZ) $(LIBBZ2) $(LIBLZMA) -lgnu
 libapt_pkg_la_LDFLAGS  = -L$(top_builddir)/lib
 libapt_pkg_la_LDFLAGS += -release $(LIBAPT_PKG_RELEASE)
 
@@ -251,7 +251,6 @@ methods_http_SOURCES   = methods/http.cc methods/http_main.cc \
 						 methods/rfc2553emu.cc methods/connect.cc \
 						 methods/rfc2553emu.h methods/http.h methods/connect.h \
 						 methods/server.cc methods/server.h
-methods_https_SOURCES  = methods/https.cc methods/https.h methods/server.cc methods/server.h
 methods_mirror_SOURCES = methods/mirror.cc methods/http.cc methods/rfc2553emu.cc \
 						 methods/connect.cc methods/mirror.h \
 						 methods/server.cc methods/server.h
@@ -259,7 +258,6 @@ methods_rred_SOURCES   = methods/rred.cc
 methods_rsh_SOURCES    = methods/rsh.cc methods/rsh.h
 
 
-methods_https_LDADD  = libapt-pkg.la -lcurl
 methods_cdrom_LDADD  = libapt-pkg.la
 methods_copy_LDADD   = libapt-pkg.la
 methods_file_LDADD   = libapt-pkg.la
@@ -271,6 +269,12 @@ methods_mirror_LDADD = libapt-pkg.la
 methods_rred_LDADD   = libapt-pkg.la
 methods_rsh_LDADD    = libapt-pkg.la
 
+if ENABLE_HTTPS
+methods_PROGRAMS += methods/https
+methods_https_LDADD = libapt-pkg.la -lcurl
+methods_https_SOURCES = methods/https.cc methods/https.h methods/server.cc methods/server.h
+endif
+
 
 # === Command line tools ===
 bin_PROGRAMS = \
@@ -281,8 +285,7 @@ cmdline/apt-config \
 cmdline/apt-extracttemplates \
 cmdline/apt-get \
 cmdline/apt-mark \
-cmdline/apt-sortpkgs \
-ftparchive/apt-ftparchive
+cmdline/apt-sortpkgs
 
 bin_SCRIPTS = cmdline/apt-key
 CLEANFILES = $(bin_SCRIPTS)
@@ -297,6 +300,19 @@ cmdline_apt_get_SOURCES              = cmdline/apt-get.cc cmdline/acqprogress.cc
 cmdline_apt_mark_SOURCES             = cmdline/apt-mark.cc
 cmdline_apt_sortpkgs_SOURCES         = cmdline/apt-sortpkgs.cc
 
+cmdline_apt_LDADD                  = libapt-pkg.la libapt-private.la
+cmdline_apt_cache_LDADD            = libapt-pkg.la libapt-private.la
+cmdline_apt_cdrom_LDADD            = libapt-pkg.la libapt-private.la
+cmdline_apt_config_LDADD           = libapt-pkg.la libapt-private.la
+cmdline_apt_get_LDADD              = libapt-pkg.la libapt-private.la
+cmdline_apt_mark_LDADD             = libapt-pkg.la libapt-private.la
+cmdline_apt_extracttemplates_LDADD = libapt-pkg.la libapt-inst.la
+cmdline_apt_sortpkgs_LDADD         = libapt-pkg.la libapt-inst.la
+
+
+if ENABLE_FTPARCHIVE
+bin_PROGRAMS += ftparchive/apt-ftparchive
+ftparchive_apt_ftparchive_LDADD = libapt-pkg.la libapt-inst.la -ldb
 ftparchive_apt_ftparchive_SOURCES = \
 ftparchive/apt-ftparchive.cc \
 ftparchive/apt-ftparchive.h \
@@ -310,19 +326,7 @@ ftparchive/override.cc \
 ftparchive/override.h \
 ftparchive/writer.cc \
 ftparchive/writer.h
-
-cmdline_apt_LDADD                  = libapt-pkg.la libapt-private.la
-cmdline_apt_cache_LDADD            = libapt-pkg.la libapt-private.la
-cmdline_apt_cdrom_LDADD            = libapt-pkg.la libapt-private.la
-cmdline_apt_config_LDADD           = libapt-pkg.la libapt-private.la
-cmdline_apt_get_LDADD              = libapt-pkg.la libapt-private.la
-cmdline_apt_mark_LDADD             = libapt-pkg.la libapt-private.la
-cmdline_apt_extracttemplates_LDADD = libapt-pkg.la libapt-inst.la
-cmdline_apt_sortpkgs_LDADD         = libapt-pkg.la libapt-inst.la
-
-
-ftparchive_apt_ftparchive_LDADD    = libapt-pkg.la libapt-inst.la -ldb -lz
-
+endif
 
 
 solvers_PROGRAMS = \
diff --git a/configure.ac b/configure.ac
index 9591e843..bafc694d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,38 +57,42 @@ have_curl="no"
 AC_CHECK_HEADER([curl/curl.h],
 [ AC_CHECK_LIB([curl], [curl_easy_init], [have_curl="yes"]) ],
 ) 
-if test "x$have_curl" != "xyes"; then
-    AC_MSG_ERROR([Curl is not usable. Check messages above.])
-fi
+AM_CONDITIONAL([ENABLE_HTTPS], [test "x$have_curl" = xyes])
 
 have_bdb="no"
 AC_CHECK_HEADER([db.h],
-[ AC_CHECK_LIB([db], [db_version], [have_dbd="yes"]) ],
+[ AC_CHECK_LIB([db], [db_version], [have_bdb="yes"]) ],
 )
-if test "x$have_dbd" != "xyes"; then
-    AC_MSG_ERROR([Berkeley DB is not usable. Check messages above.])
-else
-    AC_DEFINE(HAVE_BDB, [1], [Define to 1 if have Berkeley DB])
-fi
+AM_CONDITIONAL([ENABLE_FTPARCHIVE], [test "x$have_bdb" = xyes])
 
 have_zlib="no"
 AC_CHECK_HEADER([zlib.h],
 [ AC_CHECK_LIB([z], [gzread], [have_zlib="yes"]) ],
 )
-if test "x$have_zlib" != "xyes"; then
-    AC_MSG_ERROR([Zlib is not usable. Check messages above.])
-else
+if test "x$have_zlib" = "xyes"; then
     AC_DEFINE(HAVE_ZLIB, [1], [Define to 1 if have Zlib])
+    LIBZ="-lz"
+    AC_SUBST([LIBZ])
 fi
 
 have_bz2="no"
 AC_CHECK_HEADER([bzlib.h],
 [ AC_CHECK_LIB([bz2], [BZ2_bzopen], [have_bz2="yes"]) ],
 )
-if test "x$have_bz2" != "xyes"; then
-    AC_MSG_ERROR([BZ  is not usable. Check messages above.])
-else
+if test "x$have_bz2" = "xyes"; then
     AC_DEFINE(HAVE_BZ2, [1], [Define to 1 if have Bzip2 library])
+    LIBBZ2="-lbz2"
+    AC_SUBST([LIBBZ2])
+fi
+
+have_lzma="no"
+AC_CHECK_HEADER([lzma.h],
+[ AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_lzma="yes"]) ],
+)
+if test "x$have_lzma" = "xyes"; then
+    AC_DEFINE(HAVE_LZMA, [1], [Define to 1 if have lzma library])
+    LIBLZMA="-llzma"
+    AC_SUBST([LIBLZMA])
 fi
 
 dnl Solaris: