From 00b06789045f7d31955a3036621d8a6623c91f5a Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Sat, 22 Sep 2012 22:23:04 +0000
Subject: [PATCH] fix warnings generated by autoreconf -Wall

---
 configure.ac            | 24 +++++++++++-------------
 gtk/Makefile.am         |  4 ++--
 macosx/Makefile.am      |  2 +-
 third-party/Makefile.am |  4 ----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index b212b354a..d1fc9fd73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,7 @@ dnl these should be the only two lines you need to change
 m4_define([user_agent_prefix],[2.61+])
 m4_define([peer_id_prefix],[-TR261Z-])
 
-AC_INIT([transmission],
-        [user_agent_prefix],
-        [http://trac.transmissionbt.com/newticket])
+AC_INIT([transmission],[user_agent_prefix],[http://trac.transmissionbt.com/newticket])
 AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix])
 AC_SUBST(PEERID_PREFIX,[peer_id_prefix])
 
@@ -19,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(libtransmission/transmission.h)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
-AC_PROG_LIBTOOL
+LT_INIT
 
 if test m4_substr(peer_id_prefix,6,1) = "0"; then
   supported_build=yes
@@ -238,11 +236,11 @@ upnp_version="none"
 ac_save_LIBS="$LIBS"
 LIBS="-lminiupnpc"
 # See if the OS has its miniupnp 1.5 installed
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
     #include <stdlib.h>
     #include <miniupnpc/miniupnpc.h>
     #include <miniupnpc/upnpcommands.h>
-],[
+]], [[
     struct UPNPDev * devlist;
     struct UPNPUrls    urls;
     struct IGDdatas    data;
@@ -254,17 +252,17 @@ AC_TRY_LINK([
     UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); 
     UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype,
                         portStr, "TCP", intClient, intPort );
-],[
+]])],[
 AC_DEFINE(HAVE_MINIUPNP_15, 1, [Define to 1 if you have miniupnpc version 1.5])
-upnp_version="1.5"])
+upnp_version="1.5"],[])
 
 # See if the OS has its miniupnp 1.6 installed
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
     #include <stdlib.h>
     #include <errno.h>
     #include <miniupnpc/miniupnpc.h>
     #include <miniupnpc/upnpcommands.h>
-],[
+]], [[
     struct UPNPDev * devlist;
     struct UPNPUrls    urls;
     struct IGDdatas    data;
@@ -276,9 +274,9 @@ AC_TRY_LINK([
     UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); 
     UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype,
                         portStr, "TCP", intClient, intPort, NULL, NULL, NULL );
-],[
+]])],[
 AC_DEFINE(HAVE_MINIUPNP_16, 1, [Define to 1 if you have miniupnpc version 1.6])
-upnp_version="1.6"])
+upnp_version="1.6"],[])
 
 # ... and the results of our tests
 LIBS="$ac_save_LIBS"
@@ -342,7 +340,7 @@ PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK_MINIMUM
                   gthread-2.0 >= $GLIB_MINIMUM],
                  [have_gtk=yes],
                  [have_gtk=no])
-AC_ARG_WITH([gtk], AC_HELP_STRING([--with-gtk],[with Gtk]),
+AC_ARG_WITH([gtk], AS_HELP_STRING([--with-gtk],[with Gtk]),
             [with_gtk=$withval],
             [with_gtk=$have_gtk])
 AM_CONDITIONAL([BUILD_GTK],[test "x$with_gtk" = "xyes"])
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1796d10ea..7e5a78dc6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -110,11 +110,11 @@ icondir = $(datadir)/pixmaps
 UI_FILES = transmission-ui.xml 
 
 transmission-resources.c: transmission.gresource.xml $(UI_FILES) 
-	glib-compile-resources --target=$@ --sourcedir=$(srcdir) \ 
+	glib-compile-resources --target=$@ --sourcedir=$(srcdir) \
 	  --generate-source --c-name transmission $< 
 
 transmission-resources.h: transmission.gresource.xml 
-	glib-compile-resources --target=$@ --sourcedir=$(srcdir) \ 
+	glib-compile-resources --target=$@ --sourcedir=$(srcdir) \
 	  --generate-header --c-name transmission $< 
 
 EXTRA_DIST = \
diff --git a/macosx/Makefile.am b/macosx/Makefile.am
index 1f4d75836..c2ae5eaf3 100644
--- a/macosx/Makefile.am
+++ b/macosx/Makefile.am
@@ -171,7 +171,7 @@ dist-hook:
 # Use Xcode do make the actual build
 all:
 	@(cd .. && xcodebuild -alltargets -activeconfiguration | grep -v "^$$")
-clean:
+clean-local:
 	@(cd .. && xcodebuild -alltargets -activeconfiguration clean | grep -v "^$$")
 
 define PACKAGE_RULE1
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index 2c28a6f65..3c8698053 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -17,7 +17,3 @@ SUBDIRS = \
 EXTRA_DIST = \
   macosx-libevent-config.h \
   macosx-libevent-event-config.h
-
-install:
-
-uninstall:
-- 
2.40.0