#837: portability patch submitted by naddy

diff --git a/cli/Makefile.am b/cli/Makefile.am
index e2335e193320f441858cff0da592aced745c0ecf..c8a6ddbdfc82e8d81939d1974763008fe846d84a 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -12,5 +12,5 @@ transmissioncli_LDADD = \
     $(top_builddir)/third-party/libevent/libevent.la \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
+    $(INTLLIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a46c00d399aeb60471dd3eaa5ab8fe3f0785d4cb..bbe720ae49e8a9a504fe608bef3185b47d4d0b32 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -32,7 +32,7 @@ COMMON_LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/libevent/libevent.la \
-    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
+    $(INTLLIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 
 transmission_daemon_SOURCES = daemon.c server.c torrents.c
 transmission_daemon_LDADD = $(COMMON_LDADD)

diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index 383f8c1f35ef62e912e27cd0865ebc7f98043abb..7628a186854257bc909daf9b16cf6d3d2aa7b5aa 100644 (file)
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -90,7 +90,7 @@ APPS_LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/libevent/libevent.la \
-    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
+    $(INTLLIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 
 benc2php_SOURCES = benc2php.c
 benc2php_LDADD = $(APPS_LDADD)

diff --git a/libtransmission/net.h b/libtransmission/net.h
index 70920cef21b360e4dc66218213c3cdc0ea702453..1ade261cb81e72446e75d527aa069f2cf7374262 100644 (file)
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -36,6 +36,7 @@
     typedef unsigned short tr_port_t;
     typedef int socklen_t;
 #else
+    #include <sys/types.h>
     #include <sys/socket.h>
     #include <netinet/in.h>
     #include <arpa/inet.h>