Changeset 13517

Timestamp:

Sep 22, 2012, 10:23:04 PM (10 years ago)

Author:

jordan

Message:

fix warnings generated by autoreconf -Wall

Location:

trunk

Files:

• configure.ac (modified) (6 diffs)
• gtk/Makefile.am (modified) (1 diff)
• macosx/Makefile.am (modified) (1 diff)
• third-party/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -7 +7 @@
 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])
@@ -20 +18 @@
 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
@@ -239 +237 @@
 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;
@@ -255 +253 @@
     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;
@@ -277 +275 @@
     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
@@ -343 +341 @@
                  [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])

trunk/gtk/Makefile.am

@@ -111 +111 @@
 
 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 $< 
 

trunk/macosx/Makefile.am

@@ -172 +172 @@
 all:
         @(cd .. && xcodebuild -alltargets -activeconfiguration | grep -v "^$$")
-clean:
+clean-local:
         @(cd .. && xcodebuild -alltargets -activeconfiguration clean | grep -v "^$$")
 

trunk/third-party/Makefile.am

@@ -18 +18 @@
   macosx-libevent-config.h \
   macosx-libevent-event-config.h
-
-install:
-
-uninstall: