Changeset 7087


Ignore:
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:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/Makefile.am

    r7062 r7087  
    11AM_CPPFLAGS = -I$(top_srcdir) $(LIBEVENT_CPPFLAGS)
    2 AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBCURL_CFLAGS) $(PTHREAD_CFLAGS)
     2
     3AM_CFLAGS = \
     4    $(OPENSSL_CFLAGS) \
     5    $(LIBCURL_CFLAGS) \
     6    $(ZLIB_CFLAGS) \
     7    $(PTHREAD_CFLAGS)
     8
     9AM_LDFLAGS = \
     10    $(ZLIB_LDFLAGS)
    311
    412bin_PROGRAMS = transmissioncli
     
    917
    1018transmissioncli_LDADD = \
    11   $(top_builddir)/libtransmission/libtransmission.a \
    12   $(top_builddir)/third-party/libevent/libevent.la \
    13   $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    14   $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    15   $(INTLLIBS) \
    16   $(LIBCURL_LIBS) \
    17   $(OPENSSL_LIBS) \
    18   $(PTHREAD_LIBS) \
    19   -lm
     19    $(top_builddir)/libtransmission/libtransmission.a \
     20    $(top_builddir)/third-party/libevent/libevent.la \
     21    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     22    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     23    $(INTLLIBS) \
     24    $(LIBCURL_LIBS) \
     25    $(ZLIB_LIBS) \
     26    $(OPENSSL_LIBS) \
     27    $(PTHREAD_LIBS) \
     28    -lm
    2029
  • trunk/configure.ac

    r7076 r7087  
    5959PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
    6060PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
    61 CHECK_ZLIB()
     61AC_PATH_ZLIB
    6262
    6363AC_SYS_LARGEFILE
  • trunk/daemon/Makefile.am

    r7062 r7087  
    11AM_CPPFLAGS = -I@top_srcdir@ $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/third-party/ -DEMBEDDED
    2 AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBCURL_CFLAGS) $(PTHREAD_CFLAGS)
     2
     3AM_CFLAGS = \
     4    $(OPENSSL_CFLAGS) \
     5    $(LIBCURL_CFLAGS) \
     6    $(ZLIB_CFLAGS) \
     7    $(PTHREAD_CFLAGS)
     8
     9AM_LDFLAGS = \
     10    $(ZLIB_LDFLAGS)
    311
    412dist_man_MANS = \
     
    1725    $(INTLLIBS) \
    1826    $(LIBCURL_LIBS) \
     27    $(ZLIB_LIBS) \
    1928    $(OPENSSL_LIBS) \
    2029    $(PTHREAD_LIBS) -lm
  • trunk/gtk/Makefile.am

    r7062 r7087  
    2929    $(LIBNOTIFY_CFLAGS) \
    3030    $(OPENSSL_CFLAGS) \
     31    $(ZLIB_CFLAGS) \
    3132    $(PTHREAD_CFLAGS)
     33
     34AM_LDFLAGS = \
     35    $(ZLIB_LDFLAGS)
    3236
    3337noinst_HEADERS = \
     
    102106    $(OPENSSL_LIBS) \
    103107    $(LIBCURL_LIBS) \
     108    $(ZLIB_LIBS) \
    104109    $(PTHREAD_LIBS) -lm
    105110
  • trunk/libtransmission/Makefile.am

    r6949 r7087  
    44        -DPACKAGE_DATA_DIR=\""$(datadir)"\"
    55
    6 AM_CFLAGS = $(LIBCURL_CFLAGS) $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
     6AM_CFLAGS = \
     7    $(LIBCURL_CFLAGS) \
     8    $(OPENSSL_CFLAGS) \
     9    $(PTHREAD_CFLAGS) \
     10    $(ZLIB_CFLAGS)
    711
    812noinst_LIBRARIES = libtransmission.a
     
    109113noinst_PROGRAMS = $(TESTS)
    110114
     115APPS_LDFLAGS = \
     116    $(ZLIB_LDFLAGS)
     117
    111118APPS_LDADD = \
    112119    ./libtransmission.a  \
     
    118125    $(OPENSSL_LIBS) \
    119126    $(PTHREAD_LIBS) \
     127    $(ZLIB_LIBS) \
    120128    -lm
    121129
  • trunk/libtransmission/rpc-server.c

    r7014 r7087  
    2121#include <unistd.h>    /* close */
    2222
    23 #ifdef HAVE_LIBZ
     23#ifdef HAVE_ZLIB
    2424 #include <zlib.h>
    2525#endif
     
    225225              size_t                  content_len )
    226226{
    227 #ifndef HAVE_LIBZ
     227#ifndef HAVE_ZLIB
    228228    evbuffer_add( out, content, content_len );
    229229#else
Note: See TracChangeset for help on using the changeset viewer.