From db7a354958d0a5a3bc783a28e47452fc3abcd3ab Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Wed, 15 Aug 2007 02:48:32 +0000
Subject: [PATCH] more work on getting our autoconf setup to play nice with
 libevent

---
 cli/Makefile.am             | 5 +++--
 configure.ac                | 4 +---
 daemon/Makefile.am          | 7 ++++++-
 gtk/Makefile.am             | 4 ++--
 libtransmission/Makefile.am | 4 +++-
 wx/Makefile.am              | 4 ++--
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 2aaa010f4..c56d923ec 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -6,6 +6,7 @@ bin_PROGRAMS = transmission-cli
 transmission_cli_SOURCES = transmissioncli.c
 
 transmission_cli_LDADD = \
-    ../libtransmission/libtransmission.a \
-    $(LIBEVENT_LIBS) \
+    $(top_builddir)/libtransmission/libtransmission.a \
+    $(top_builddir)/third-party/libevent/libevent.la \
     $(PTHREAD_LIBS) -lm
+
diff --git a/configure.ac b/configure.ac
index 62f2c5426..71765bd16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ(2.54)
 dnl AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(libtransmission/transmission.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
-AM_MAINTAINER_MODE
+AC_PROG_LIBTOOL
 
 GLIB_MINIMUM=2.6.0
 GTK_MINIMUM=2.6.0
@@ -48,9 +48,7 @@ dnl  libevent fun
 
 AC_CONFIG_SUBDIRS([third-party/libevent])
 AC_MSG_NOTICE([invoking libevent's configure script])
-LIBEVENT_LIBS="\$(top_srcdir)/third-party/libevent/.libs/libevent.a"
 LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
-AC_SUBST(LIBEVENT_LIBS)
 AC_SUBST(LIBEVENT_CPPFLAGS)
 
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 32359dd60..d3b6274ed 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,7 +19,12 @@ bin_PROGRAMS = \
     transmission-remote \
     transmission-proxy
 
-COMMON_LDADD = ./libdaemon.a ../libtransmission/libtransmission.a -levent $(PTHREAD_LIBS) -lm
+COMMON_LDADD = \
+    ./libdaemon.a \
+    $(top_builddir)/libtransmission/libtransmission.a \
+    $(top_builddir)/third-party/libevent/libevent.la \
+    $(PTHREAD_LIBS) -lm
+
 transmission_daemon_SOURCES = daemon.c server.c torrents.c
 transmission_daemon_LDADD = $(COMMON_LDADD)
 transmission_remote_SOURCES = client.c remote.c
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 09fd3bf4e..c4af28516 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -50,8 +50,8 @@ transmission_gtk_SOURCES = \
     util.c
 
 transmission_gtk_LDADD = \
-    ../libtransmission/libtransmission.a \
+    $(top_builddir)/libtransmission/libtransmission.a \
+    $(top_builddir)/third-party/libevent/libevent.la \
     $(GTK_LIBS) \
     $(GLIB_LIBS) \
-    $(LIBEVENT_LIBS) \
     $(PTHREAD_LIBS) -lm
diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index 094adedea..a876080cd 100644
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -1,4 +1,6 @@
-AM_CPPFLAGS = -I. -I@top_srcdir@ -D__TRANSMISSION__
+AM_CPPFLAGS = -I. -I$(top_srcdir) -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS)
+
+AM_CFLAGS = $(PTHREAD_CFLAGS)
 
 noinst_LIBRARIES = libtransmission.a
 
diff --git a/wx/Makefile.am b/wx/Makefile.am
index 3806cc9a7..9dfcdc07c 100644
--- a/wx/Makefile.am
+++ b/wx/Makefile.am
@@ -17,7 +17,7 @@ Xmission_SOURCES = \
   xmission.cc
 
 Xmission_LDADD = \
-  ../libtransmission/libtransmission.a \
-  $(LIBEVENT_LIBS) \
+  $(top_builddir)/libtransmission/libtransmission.a \
+  $(top_builddir)/third-party/libevent/libevent.la \
   $(WX_LIBS) \
   $(PTHREAD_LIBS) -lm