better openssl detection & support: use openssl's pkg-config file.

cli/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBEVENT_CPPFLAGS)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
 
 bin_PROGRAMS = transmission-cli
 
@@ -10,5 +10,5 @@ transmission_cli_SOURCES = transmissioncli.c
 transmission_cli_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
     $(top_builddir)/third-party/libevent/libevent.la \
-    $(PTHREAD_LIBS) -lm
+    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 

configure.ac

@@ -31,10 +31,9 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 ACX_PTHREAD
 
-AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
-AC_CHECK_LIB([ssl],[SSL_library_init])
 AC_SEARCH_LIBS([socket], [socket net])
 AC_SEARCH_LIBS([gethostbyname], [nsl bind])
+PKG_CHECK_MODULES(OPENSSL, [openssl >= 0.9.8])
 
 dnl ----------------------------------------------------------------------------
 dnl

daemon/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I@top_srcdir@ $(LIBEVENT_CPPFLAGS)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
 
 noinst_LIBRARIES = libdaemon.a
 
@@ -29,7 +29,7 @@ COMMON_LDADD = \
     ./libdaemon.a \
     $(top_builddir)/libtransmission/libtransmission.a \
     $(top_builddir)/third-party/libevent/libevent.la \
-    $(PTHREAD_LIBS) -lm
+    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 
 transmission_daemon_SOURCES = daemon.c server.c torrents.c
 transmission_daemon_LDADD = $(COMMON_LDADD)

gtk/Makefile.am

@@ -1,10 +1,12 @@
 AM_CPPFLAGS = \
     -I$(top_srcdir) \
     $(LIBEVENT_CPPFLAGS) \
-    $(GTK_CFLAGS) \
     -DTRANSMISSIONLOCALEDIR=\""$(transmissionlocaledir)"\"
 
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS = \
+    $(GTK_CFLAGS) \
+    $(OPENSSL_CFLAGS) \
+    $(PTHREAD_CFLAGS)
 
 noinst_HEADERS = \
     actions.h \
@@ -54,6 +56,7 @@ transmission_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
     $(top_builddir)/third-party/libevent/libevent.la \
     $(GTK_LIBS) \
+    $(OPENSSL_LIBS) \
     $(PTHREAD_LIBS) -lm
 
 DESKTOP_IN_FILES=transmission.desktop.in

libtransmission/Makefile.am

@@ -1,6 +1,5 @@
 AM_CPPFLAGS = -I. -I$(top_srcdir) -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS)
-
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
 
 noinst_LIBRARIES = libtransmission.a
 

wx/Makefile.am

@@ -1,8 +1,5 @@
-AM_CPPFLAGS = \
-  -I$(top_srcdir) \
-  $(WX_CPPFLAGS) \
-  $(LIBEVENT_CPPFLAGS)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(WX_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
+AM_CFLAGS = $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS)
 AM_CXXFLAGS = $(WX_CXXFLAGS)
 
 SUBDIRS = images
@@ -19,5 +16,4 @@ Xmission_SOURCES = \
 Xmission_LDADD = \
   $(top_builddir)/libtransmission/libtransmission.a \
   $(top_builddir)/third-party/libevent/libevent.la \
-  $(WX_LIBS) \
-  $(PTHREAD_LIBS) -lm
+  $(WX_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm