Changeset 7087

Timestamp:

Nov 9, 2008, 3:43:31 PM (12 years ago)

Author:

charles

Message:

#1443: check for zlib fails when providing a specific path

Location:

trunk

Files:

• cli/Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• daemon/Makefile.am (modified) (2 diffs)
• gtk/Makefile.am (modified) (2 diffs)
• libtransmission/Makefile.am (modified) (3 diffs)
• libtransmission/rpc-server.c (modified) (2 diffs)
• m4/check-zlib.m4 (deleted)
• m4/zlib.m4 (added)

trunk/cli/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBEVENT_CPPFLAGS)
-AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBCURL_CFLAGS) $(PTHREAD_CFLAGS)
+
+AM_CFLAGS = \
+    $(OPENSSL_CFLAGS) \
+    $(LIBCURL_CFLAGS) \
+    $(ZLIB_CFLAGS) \
+    $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = \
+    $(ZLIB_LDFLAGS)
 
 bin_PROGRAMS = transmissioncli
@@ -9 +17 @@
 
 transmissioncli_LDADD = \
-  $(top_builddir)/libtransmission/libtransmission.a \
-  $(top_builddir)/third-party/libevent/libevent.la \
-  $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-  $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-  $(INTLLIBS) \
-  $(LIBCURL_LIBS) \
-  $(OPENSSL_LIBS) \
-  $(PTHREAD_LIBS) \
-  -lm
+    $(top_builddir)/libtransmission/libtransmission.a \
+    $(top_builddir)/third-party/libevent/libevent.la \
+    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+    $(INTLLIBS) \
+    $(LIBCURL_LIBS) \
+    $(ZLIB_LIBS) \
+    $(OPENSSL_LIBS) \
+    $(PTHREAD_LIBS) \
+    -lm
 

trunk/configure.ac

@@ -59 +59 @@
 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
 PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
-CHECK_ZLIB()
+AC_PATH_ZLIB
 
 AC_SYS_LARGEFILE

trunk/daemon/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I@top_srcdir@ $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/third-party/ -DEMBEDDED
-AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBCURL_CFLAGS) $(PTHREAD_CFLAGS)
+
+AM_CFLAGS = \
+    $(OPENSSL_CFLAGS) \
+    $(LIBCURL_CFLAGS) \
+    $(ZLIB_CFLAGS) \
+    $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = \
+    $(ZLIB_LDFLAGS)
 
 dist_man_MANS = \
@@ -17 +25 @@
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \
+    $(ZLIB_LIBS) \
     $(OPENSSL_LIBS) \
     $(PTHREAD_LIBS) -lm

trunk/gtk/Makefile.am

@@ -29 +29 @@
     $(LIBNOTIFY_CFLAGS) \
     $(OPENSSL_CFLAGS) \
+    $(ZLIB_CFLAGS) \
     $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = \
+    $(ZLIB_LDFLAGS)
 
 noinst_HEADERS = \
@@ -102 +106 @@
     $(OPENSSL_LIBS) \
     $(LIBCURL_LIBS) \
+    $(ZLIB_LIBS) \
     $(PTHREAD_LIBS) -lm
 

trunk/libtransmission/Makefile.am

@@ -4 +4 @@
         -DPACKAGE_DATA_DIR=\""$(datadir)"\"
 
-AM_CFLAGS = $(LIBCURL_CFLAGS) $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
+AM_CFLAGS = \
+    $(LIBCURL_CFLAGS) \
+    $(OPENSSL_CFLAGS) \
+    $(PTHREAD_CFLAGS) \
+    $(ZLIB_CFLAGS)
 
 noinst_LIBRARIES = libtransmission.a
@@ -109 +113 @@
 noinst_PROGRAMS = $(TESTS)
 
+APPS_LDFLAGS = \
+    $(ZLIB_LDFLAGS)
+
 APPS_LDADD = \
     ./libtransmission.a  \
@@ -118 +125 @@
     $(OPENSSL_LIBS) \
     $(PTHREAD_LIBS) \
+    $(ZLIB_LIBS) \
     -lm
 

trunk/libtransmission/rpc-server.c

@@ -21 +21 @@
 #include <unistd.h>    /* close */
 
-#ifdef HAVE_LIBZ
+#ifdef HAVE_ZLIB
  #include <zlib.h>
 #endif
@@ -225 +225 @@
               size_t                  content_len )
 {
-#ifndef HAVE_LIBZ
+#ifndef HAVE_ZLIB
     evbuffer_add( out, content, content_len );
 #else