Changeset 7087
- Timestamp:
- Nov 9, 2008, 3:43:31 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cli/Makefile.am
r7062 r7087 1 1 AM_CPPFLAGS = -I$(top_srcdir) $(LIBEVENT_CPPFLAGS) 2 AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBCURL_CFLAGS) $(PTHREAD_CFLAGS) 2 3 AM_CFLAGS = \ 4 $(OPENSSL_CFLAGS) \ 5 $(LIBCURL_CFLAGS) \ 6 $(ZLIB_CFLAGS) \ 7 $(PTHREAD_CFLAGS) 8 9 AM_LDFLAGS = \ 10 $(ZLIB_LDFLAGS) 3 11 4 12 bin_PROGRAMS = transmissioncli … … 9 17 10 18 transmissioncli_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 20 29 -
trunk/configure.ac
r7076 r7087 59 59 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()]) 60 60 PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM]) 61 CHECK_ZLIB() 61 AC_PATH_ZLIB 62 62 63 63 AC_SYS_LARGEFILE -
trunk/daemon/Makefile.am
r7062 r7087 1 1 AM_CPPFLAGS = -I@top_srcdir@ $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/third-party/ -DEMBEDDED 2 AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBCURL_CFLAGS) $(PTHREAD_CFLAGS) 2 3 AM_CFLAGS = \ 4 $(OPENSSL_CFLAGS) \ 5 $(LIBCURL_CFLAGS) \ 6 $(ZLIB_CFLAGS) \ 7 $(PTHREAD_CFLAGS) 8 9 AM_LDFLAGS = \ 10 $(ZLIB_LDFLAGS) 3 11 4 12 dist_man_MANS = \ … … 17 25 $(INTLLIBS) \ 18 26 $(LIBCURL_LIBS) \ 27 $(ZLIB_LIBS) \ 19 28 $(OPENSSL_LIBS) \ 20 29 $(PTHREAD_LIBS) -lm -
trunk/gtk/Makefile.am
r7062 r7087 29 29 $(LIBNOTIFY_CFLAGS) \ 30 30 $(OPENSSL_CFLAGS) \ 31 $(ZLIB_CFLAGS) \ 31 32 $(PTHREAD_CFLAGS) 33 34 AM_LDFLAGS = \ 35 $(ZLIB_LDFLAGS) 32 36 33 37 noinst_HEADERS = \ … … 102 106 $(OPENSSL_LIBS) \ 103 107 $(LIBCURL_LIBS) \ 108 $(ZLIB_LIBS) \ 104 109 $(PTHREAD_LIBS) -lm 105 110 -
trunk/libtransmission/Makefile.am
r6949 r7087 4 4 -DPACKAGE_DATA_DIR=\""$(datadir)"\" 5 5 6 AM_CFLAGS = $(LIBCURL_CFLAGS) $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS) 6 AM_CFLAGS = \ 7 $(LIBCURL_CFLAGS) \ 8 $(OPENSSL_CFLAGS) \ 9 $(PTHREAD_CFLAGS) \ 10 $(ZLIB_CFLAGS) 7 11 8 12 noinst_LIBRARIES = libtransmission.a … … 109 113 noinst_PROGRAMS = $(TESTS) 110 114 115 APPS_LDFLAGS = \ 116 $(ZLIB_LDFLAGS) 117 111 118 APPS_LDADD = \ 112 119 ./libtransmission.a \ … … 118 125 $(OPENSSL_LIBS) \ 119 126 $(PTHREAD_LIBS) \ 127 $(ZLIB_LIBS) \ 120 128 -lm 121 129 -
trunk/libtransmission/rpc-server.c
r7014 r7087 21 21 #include <unistd.h> /* close */ 22 22 23 #ifdef HAVE_ LIBZ23 #ifdef HAVE_ZLIB 24 24 #include <zlib.h> 25 25 #endif … … 225 225 size_t content_len ) 226 226 { 227 #ifndef HAVE_ LIBZ227 #ifndef HAVE_ZLIB 228 228 evbuffer_add( out, content, content_len ); 229 229 #else
Note: See TracChangeset
for help on using the changeset viewer.