Changeset 3620


Ignore:
Timestamp:
Oct 28, 2007, 7:55:02 PM (15 years ago)
Author:
charles
Message:

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

Location:
branches/0.9x
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/0.9x/cli/Makefile.am

    r3546 r3620  
    11AM_CPPFLAGS = -I$(top_srcdir) $(LIBEVENT_CPPFLAGS)
    2 AM_CFLAGS = $(PTHREAD_CFLAGS)
     2AM_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
    33
    44bin_PROGRAMS = transmission-cli
    … …  
    1111    $(top_builddir)/libtransmission/libtransmission.a \
    1212    $(top_builddir)/third-party/libevent/libevent.la \
    13     $(PTHREAD_LIBS) -lm
     13    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
    1414

  • branches/0.9x/configure.ac

    r3605 r3620  
    3535ACX_PTHREAD
    3636
    37 AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
    38 AC_CHECK_LIB([ssl],[SSL_library_init])
    3937AC_SEARCH_LIBS([socket], [socket net])
    4038AC_SEARCH_LIBS([gethostbyname], [nsl bind])
     39PKG_CHECK_MODULES(OPENSSL, [openssl >= 0.9.8])
    4140
    4241dnl ----------------------------------------------------------------------------

  • branches/0.9x/daemon/Makefile.am

    r3546 r3620  
    11AM_CPPFLAGS = -I@top_srcdir@ $(LIBEVENT_CPPFLAGS)
    2 AM_CFLAGS = $(PTHREAD_CFLAGS)
     2AM_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
    33
    44noinst_LIBRARIES = libdaemon.a
    … …  
    3030    $(top_builddir)/libtransmission/libtransmission.a \
    3131    $(top_builddir)/third-party/libevent/libevent.la \
    32     $(PTHREAD_LIBS) -lm
     32    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
    3333
    3434transmission_daemon_SOURCES = daemon.c server.c torrents.c

  • branches/0.9x/gtk/Makefile.am

    r3546 r3620  
    22    -I$(top_srcdir) \
    33    $(LIBEVENT_CPPFLAGS) \
    4     $(GTK_CFLAGS) \
    54    -DTRANSMISSIONLOCALEDIR=\""$(transmissionlocaledir)"\"
    65
    7 AM_CFLAGS = $(PTHREAD_CFLAGS)
     6AM_CFLAGS = \
     7    $(GTK_CFLAGS) \
     8    $(OPENSSL_CFLAGS) \
     9    $(PTHREAD_CFLAGS)
    810
    911noinst_HEADERS = \
    … …  
    5557    $(top_builddir)/third-party/libevent/libevent.la \
    5658    $(GTK_LIBS) \
     59    $(OPENSSL_LIBS) \
    5760    $(PTHREAD_LIBS) -lm
    5861

  • branches/0.9x/libtransmission/Makefile.am

    r3538 r3620  
    11AM_CPPFLAGS = -I. -I$(top_srcdir) -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS)
    2 
    3 AM_CFLAGS = $(PTHREAD_CFLAGS)
     2AM_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
    43
    54noinst_LIBRARIES = libtransmission.a

  • branches/0.9x/wx/Makefile.am

    r2913 r3620  
    1 AM_CPPFLAGS = \
    2   -I$(top_srcdir) \
    3   $(WX_CPPFLAGS) \
    4   $(LIBEVENT_CPPFLAGS)
    5 AM_CFLAGS = $(PTHREAD_CFLAGS)
     1AM_CPPFLAGS = -I$(top_srcdir) $(WX_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
     2AM_CFLAGS = $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS)
    63AM_CXXFLAGS = $(WX_CXXFLAGS)
    74
    … …  
    2017  $(top_builddir)/libtransmission/libtransmission.a \
    2118  $(top_builddir)/third-party/libevent/libevent.la \
    22   $(WX_LIBS) \
    23   $(PTHREAD_LIBS) -lm
     19  $(WX_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
Note: See TracChangeset for help on using the changeset viewer.