From: Jordan Lee <jordan@transmissionbt.com>
Date: Sun, 13 Jul 2014 21:54:56 +0000 (+0000)
Subject: use pkg-config to get the zlib cflags/libs; remove obsolete zlib.m4 macro
X-Git-Tag: 2.90~369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab24ef9fcb1c4bbc8873858be3effeee2cb20292;p=transmission

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

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 7c2bc72bc..fb77a391b 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -7,9 +7,6 @@ AM_CFLAGS = \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@
 
-AM_LDFLAGS = \
-    @ZLIB_LDFLAGS@
-
 bin_PROGRAMS = transmission-cli
 
 dist_man_MANS = transmission-cli.1
diff --git a/configure.ac b/configure.ac
index 733d7ebc9..6ea9d8a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,8 @@ LIBEVENT_MINIMUM=2.0.10
 AC_SUBST(LIBEVENT_MINIMUM)
 OPENSSL_MINIMUM=0.9.4
 AC_SUBST(OPENSSL_MINIMUM)
+ZLIB_MINIMUM=1.2.5
+AC_SUBST(ZLIB_MINIMUM)
 
 ##
 ##
@@ -112,7 +114,7 @@ AC_SEARCH_LIBS([quotacursor_skipidtype], [quota])
 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
 PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
 PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_MINIMUM])
-AC_PATH_ZLIB
+PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_MINIMUM])
 
 AC_SYS_LARGEFILE
 AC_CHECK_FUNCS([lseek64])
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 88b61a407..7f1ee907a 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -8,9 +8,6 @@ AM_CFLAGS = \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@
 
-AM_LDFLAGS = \
-    @ZLIB_LDFLAGS@
-
 EXTRA_DIST = \
     transmission-daemon.service
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d5929a9dd..f29248275 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -25,9 +25,6 @@ AM_CFLAGS = \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@
 
-AM_LDFLAGS = \
-    @ZLIB_LDFLAGS@
-
 noinst_HEADERS = \
     actions.h \
     conf.h \
diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index e841a2d2b..0fd422a2c 100644
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -161,9 +161,6 @@ TESTS = \
 
 noinst_PROGRAMS = $(TESTS)
 
-apps_ldflags = \
-  @ZLIB_LDFLAGS@
-
 apps_ldadd = \
   ./libtransmission.a  \
   @LIBUPNP_LIBS@ \
diff --git a/m4/zlib.m4 b/m4/zlib.m4
deleted file mode 100644
index b9c3a55fb..000000000
--- a/m4/zlib.m4
+++ /dev/null
@@ -1,80 +0,0 @@
- AC_DEFUN([AC_PATH_ZLIB], [
-	AC_ARG_WITH(zlib,
-                    AC_HELP_STRING([--with-zlib=DIR],
-                                 [search for ZLIB in DIR/include and DIR/lib]),
-                    [for dir in `echo "$withval" | tr : ' '`; do
-    if test -d $dir/include; then
-      ZLIB_CFLAGS="$ZLIB_CFLAGS -I$dir/include"
-    fi
-    if test -d $dir/lib; then
-      ZLIB_LDFLAGS="$ZLIB_LDFLAGS -L$dir/lib"
-    fi
-  done[]])
-
-        AC_ARG_WITH(zlib-includes,
-                    AC_HELP_STRING([--with-zlib-includes=DIR],
-	                           [search for ZLIB includes in DIR]),
-	            [for dir in `echo "$withval" | tr : ' '`; do
-    if test -d $dir; then
-      ZLIB_CFLAGS="$ZLIB_CFLAGS -I$dir"
-    fi
-  done[]])
-
-ac_zlib_saved_CFLAGS="$CFLAGS"
-ac_zlib_saved_LDFLAGS="$LDFLAGS"
-ac_zlib_saved_LIBS="$LIBS"
-CFLAGS="$CFLAGS $ZLIB_CFLAGS"
-LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
-ac_have_zlibh=no
-ac_have_zlib=no
-  	touch /tmp/dummy1_zlib.h
-        AC_CHECK_HEADERS([/tmp/dummy1_zlib.h], [ac_have_zlibh=yes], [ac_have_zlibh=no],
-		[#include "zlib.h"])
-	rm /tmp/dummy1_zlib.h
- 	if test $ac_have_zlibh = yes; then
-        	AC_SEARCH_LIBS(gzopen, [z], [ac_have_zlib=yes], [ac_have_zlib=no])
-	fi
-# List of places to try
-testdirs="$HOME/opt/zlib $OBITINSTALL/other"
-for dir in $testdirs; do
-	if test $ac_have_zlib = no; then
-		if  test -f $dir/include/zlib.h; then
-			ZLIB_CFLAGS="-I$dir/include"
-			CPPFLAGS="$ac_zlib_saved_CPPFLAGS $ZLIB_CFLAGS"
-			ZLIB_LDFLAGS="-L$dir/lib"
-			LDFLAGS="$ac_zlib_saved_LDFLAGS $ZLIB_LDFLAGS"
-  			touch /tmp/dummy3_zlib.h
- 		        AC_CHECK_HEADERS([/tmp/dummy3_zlib.h], [ac_have_zlibh=yes], [ac_have_zlibh=no],
-				[#include "zlib.h"])
-			rm /tmp/dummy3_zlib.h
-			if test $ac_have_zlibh = yes; then
-				# Force check
-				ac_cv_search_gzopen="  "
-		        	AC_SEARCH_LIBS(gzopen, [z], [ac_have_zlib=yes], [ac_have_zlib=no])
-			fi
-			if test $ac_have_zlib = yes ; then
-				if test $ac_have_zlibh = yes ; then
-					break;
-				fi
-			fi
-		fi
-	fi
-done[]
-if test $ac_have_zlib = no; then
-	AC_MSG_WARN([cannot find ZLIB library])
-fi
-if test $ac_have_zlibh = no; then
-	AC_MSG_WARN([cannot find ZLIB headers])
-	ac_have_zlib=no
-fi
-if test $ac_have_zlib = yes; then
-	AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.])
-fi
-ZLIB_LIBS="$LIBS"
-CFLAGS="$ac_zlib_saved_CFLAGS"
-LDFLAGS="$ac_zlib_saved_LDFLAGS"
-LIBS="$ac_zlib_saved_LIBS"
-	AC_SUBST(ZLIB_CFLAGS)
-	AC_SUBST(ZLIB_LDFLAGS)
-	AC_SUBST(ZLIB_LIBS)
-])
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 1e710fc8e..ad4023f24 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -7,9 +7,6 @@ AM_CFLAGS = \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@
 
-AM_LDFLAGS = \
-    @ZLIB_LDFLAGS@
-
 bin_PROGRAMS = \
     transmission-create \
     transmission-edit \