Changeset 14323


Ignore:
Timestamp:
Jul 13, 2014, 9:54:56 PM (4 years ago)
Author:
jordan
Message:

use pkg-config to get the zlib cflags/libs; remove obsolete zlib.m4 macro

Location:
trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/cli/Makefile.am

    r13199 r14323  
    77    @ZLIB_CFLAGS@ \
    88    @PTHREAD_CFLAGS@
    9 
    10 AM_LDFLAGS = \
    11     @ZLIB_LDFLAGS@
    129
    1310bin_PROGRAMS = transmission-cli

  • trunk/configure.ac

    r14318 r14323  
    4343OPENSSL_MINIMUM=0.9.4
    4444AC_SUBST(OPENSSL_MINIMUM)
     45ZLIB_MINIMUM=1.2.5
     46AC_SUBST(ZLIB_MINIMUM)
    4547
    4648##
    … …  
    113115PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
    114116PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_MINIMUM])
    115 AC_PATH_ZLIB
     117PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_MINIMUM])
    116118
    117119AC_SYS_LARGEFILE

  • trunk/daemon/Makefile.am

    r14087 r14323  
    88    @ZLIB_CFLAGS@ \
    99    @PTHREAD_CFLAGS@
    10 
    11 AM_LDFLAGS = \
    12     @ZLIB_LDFLAGS@
    1310
    1411EXTRA_DIST = \

  • trunk/gtk/Makefile.am

    r14235 r14323  
    2525    @ZLIB_CFLAGS@ \
    2626    @PTHREAD_CFLAGS@
    27 
    28 AM_LDFLAGS = \
    29     @ZLIB_LDFLAGS@
    3027
    3128noinst_HEADERS = \

  • trunk/libtransmission/Makefile.am

    r14314 r14323  
    162162noinst_PROGRAMS = $(TESTS)
    163163
    164 apps_ldflags = \
    165   @ZLIB_LDFLAGS@
    166 
    167164apps_ldadd = \
    168165  ./libtransmission.a  \

  • trunk/utils/Makefile.am

    r14297 r14323  
    77    @ZLIB_CFLAGS@ \
    88    @PTHREAD_CFLAGS@
    9 
    10 AM_LDFLAGS = \
    11     @ZLIB_LDFLAGS@
    129
    1310bin_PROGRAMS = \
Note: See TracChangeset for help on using the changeset viewer.