Changeset 9795


Ignore:
Timestamp:
Dec 18, 2009, 5:02:48 AM (13 years ago)
Author:
charles
Message:

(trunk) use AC_ARG_VAR for some autoconf variables s.t. their values will persist between reconfs

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/Makefile.am

    r8790 r9795  
    1 AM_CPPFLAGS = -I$(top_srcdir)
     1AM_CPPFLAGS = -I@top_srcdir@
    22
    33AM_CFLAGS = \
    4     $(LIBEVENT_CFLAGS) \
    5     $(OPENSSL_CFLAGS) \
    6     $(LIBCURL_CFLAGS) \
    7     $(ZLIB_CFLAGS) \
    8     $(PTHREAD_CFLAGS)
     4    @LIBEVENT_CFLAGS@ \
     5    @OPENSSL_CFLAGS@ \
     6    @LIBCURL_CFLAGS@ \
     7    @ZLIB_CFLAGS@ \
     8    @PTHREAD_CFLAGS@
    99
    1010AM_LDFLAGS = \
    11     $(ZLIB_LDFLAGS)
     11    @ZLIB_LDFLAGS@
    1212
    1313bin_PROGRAMS = transmissioncli
     
    2121    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    2222    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    23     $(DHT_LIBS) \
    24     $(LIBEVENT_LIBS) \
    25     $(INTLLIBS) \
    26     $(LIBCURL_LIBS) \
    27     $(ZLIB_LIBS) \
    28     $(OPENSSL_LIBS) \
    29     $(PTHREAD_LIBS)
     23    @DHT_LIBS@ \
     24    @LIBEVENT_LIBS@ \
     25    @LIBCURL_LIBS@ \
     26    @OPENSSL_LIBS@ \
     27    @INTLLIBS@ \
     28    @ZLIB_LIBS@ \
     29    @PTHREAD_LIBS@
    3030
  • trunk/configure.ac

    r9794 r9795  
    4747 AC_SUBST(GCONF2_MINIMUM)
    4848GIO_MINIMUM=2.15.5
    49   AC_SUBST(GIO_MINIMUM)
     49 AC_SUBST(GIO_MINIMUM)
    5050GLIB_MINIMUM=2.6.0
    51   AC_SUBST(GLIB_MINIMUM)
     51 AC_SUBST(GLIB_MINIMUM)
    5252GTK_MINIMUM=2.6.0
    53   AC_SUBST(GTK_MINIMUM)
     53 AC_SUBST(GTK_MINIMUM)
    5454LIBEVENT_MINIMUM=1.4.5
    55   AC_SUBST(LIBEVENT_MINIUM)
     55 AC_SUBST(LIBEVENT_MINIUM)
    5656LIBNOTIFY_MINIMUM=0.4.3
    57   AC_SUBST(LIBNOTIFY_MINIMUM)
     57 AC_SUBST(LIBNOTIFY_MINIMUM)
    5858OPENSSL_MINIMUM=0.9.4
    59   AC_SUBST(OPENSSL_MINIMUM)
     59 AC_SUBST(OPENSSL_MINIMUM)
    6060
    6161AC_PROG_CC
     
    204204    LIBEVENT_LIBS="-levent $libevent_extra_libs"
    205205fi
    206 AC_SUBST(LIBEVENT_CFLAGS)
    207 AC_SUBST(LIBEVENT_LIBS)
     206AC_ARG_VAR([LIBEVENT_CFLAGS], [C compiler flags for LIBEVENT, overriding pkg-config])dnl
     207AC_ARG_VAR([LIBEVENT_LIBS], [linker flags for LIBEVENT, overriding pkg-config])dnl
     208
    208209
    209210
     
    211212dnl
    212213dnl  dht
    213 
    214214
    215215DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
     
    246246fi
    247247AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
    248 AC_SUBST(GTK_LIBS)
    249 AC_SUBST(GTK_CFLAGS)
    250248
    251249if test "x$build_gtk" = "xyes"; then
     
    255253                      [use_gio=yes],
    256254                      [use_gio=no])
    257     AC_SUBST(GIO_LIBS)
    258     AC_SUBST(GIO_CFLAGS)
    259255    if test "x$use_gio" = "xyes"; then
    260256        AC_DEFINE([HAVE_GIO], 1)
     
    272268        if test "x$have_libnotify" = "xyes"; then
    273269            use_libnotify=yes
    274             AC_SUBST(LIBNOTIFY_LIBS)
    275             AC_SUBST(LIBNOTIFY_CFLAGS)
    276270            AC_DEFINE([HAVE_LIBNOTIFY], 1)
    277271        fi
     
    289283        if test "x$have_libcanberra" = "xyes"; then
    290284            use_canberra=yes
    291             AC_SUBST(LIBCANBERRA_LIBS)
    292             AC_SUBST(LIBCANBERRA_CFLAGS)
    293285            AC_DEFINE([HAVE_LIBCANBERRA], 1)
    294286        fi
     
    306298        if test "x$have_libgconf" = "xyes"; then
    307299            use_libgconf=yes
    308             AC_SUBST(LIBGCONF_LIBS)
    309             AC_SUBST(LIBGCONF_CFLAGS)
    310300            AC_DEFINE([HAVE_LIBGCONF], 1)
    311301        fi
     
    316306                      [use_dbus_glib=yes],
    317307                      [use_dbus_glib=no])
    318     AC_SUBST(DBUS_GLIB_LIBS)
    319     AC_SUBST(DBUS_GLIB_CFLAGS)
    320308    if test "x$use_dbus_glib" = "xyes"; then
    321309        AC_DEFINE([HAVE_DBUS_GLIB], 1)
  • trunk/daemon/Makefile.am

    r8790 r9795  
    22
    33AM_CFLAGS = \
    4     $(LIBEVENT_CFLAGS) \
    5     $(OPENSSL_CFLAGS) \
    6     $(LIBCURL_CFLAGS) \
    7     $(ZLIB_CFLAGS) \
    8     $(PTHREAD_CFLAGS)
     4    @LIBEVENT_CFLAGS@ \
     5    @OPENSSL_CFLAGS@ \
     6    @LIBCURL_CFLAGS@ \
     7    @ZLIB_CFLAGS@ \
     8    @PTHREAD_CFLAGS@
    99
    1010AM_LDFLAGS = \
    11     $(ZLIB_LDFLAGS)
     11    @ZLIB_LDFLAGS@
    1212
    1313dist_man_MANS = \
     
    2323    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    2424    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    25     $(DHT_LIBS) \
    26     $(LIBEVENT_LIBS) \
    27     $(INTLLIBS) \
    28     $(LIBCURL_LIBS) \
    29     $(ZLIB_LIBS) \
    30     $(OPENSSL_LIBS) \
    31     $(PTHREAD_LIBS)
     25    @DHT_LIBS@ \
     26    @LIBEVENT_LIBS@ \
     27    @LIBCURL_LIBS@ \
     28    @OPENSSL_LIBS@ \
     29    @INTLLIBS@ \
     30    @ZLIB_LIBS@ \
     31    @PTHREAD_LIBS@
    3232
    3333noinst_HEADERS = \
  • trunk/gtk/Makefile.am

    r9634 r9795  
    2121
    2222AM_CFLAGS = \
    23     $(LIBEVENT_CFLAGS) \
    24     $(LIBCANBERRA_CFLAGS) \
    25     $(LIBGCONF_CFLAGS) \
    26     $(GTK_CFLAGS) \
    27     $(LIBCURL_CFLAGS) \
    28     $(GIO_CFLAGS) \
    29     $(DBUS_GLIB_CFLAGS) \
    30     $(LIBNOTIFY_CFLAGS) \
    31     $(OPENSSL_CFLAGS) \
    32     $(ZLIB_CFLAGS) \
    33     $(PTHREAD_CFLAGS)
     23    @LIBEVENT_CFLAGS@ \
     24    @LIBCANBERRA_CFLAGS@ \
     25    @LIBGCONF_CFLAGS@ \
     26    @GTK_CFLAGS@ \
     27    @LIBCURL_CFLAGS@ \
     28    @GIO_CFLAGS@ \
     29    @LIBNOTIFY_CFLAGS@ \
     30    @DBUS_GLIB_CFLAGS@ \
     31    @OPENSSL_CFLAGS@ \
     32    @ZLIB_CFLAGS@ \
     33    @PTHREAD_CFLAGS@
    3434
    3535AM_LDFLAGS = \
    36     $(ZLIB_LDFLAGS)
     36    @ZLIB_LDFLAGS@
    3737
    3838noinst_HEADERS = \
     
    105105    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    106106    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    107     $(LIBCANBERRA_LIBS) \
    108     $(LIBGCONF_LIBS) \
    109     $(DHT_LIBS) \
    110     $(GTK_LIBS) \
    111     $(GIO_LIBS) \
    112     $(LIBNOTIFY_LIBS) \
    113     $(LIBEVENT_LIBS) \
    114     $(DBUS_GLIB_LIBS) \
    115     $(OPENSSL_LIBS) \
    116     $(LIBCURL_LIBS) \
    117     $(ZLIB_LIBS) \
    118     $(PTHREAD_LIBS)
     107    @LIBCANBERRA_LIBS@ \
     108    @LIBGCONF_LIBS@ \
     109    @DHT_LIBS@ \
     110    @GTK_LIBS@ \
     111    @GIO_LIBS@ \
     112    @LIBNOTIFY_LIBS@ \
     113    @LIBEVENT_LIBS@ \
     114    @DBUS_GLIB_LIBS@ \
     115    @LIBCURL_LIBS@ \
     116    @OPENSSL_LIBS@ \
     117    @ZLIB_LIBS@ \
     118    @PTHREAD_LIBS@
    119119
    120120DESKTOP_IN_FILES=transmission.desktop.in
  • trunk/libtransmission/Makefile.am

    r9558 r9795  
    1 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(top_srcdir)/third-party/ -D__TRANSMISSION__ -DPACKAGE_DATA_DIR=\""$(datadir)"\"
     1AM_CPPFLAGS = \
     2    -I. \
     3    -I$(top_srcdir) \
     4    -I$(top_srcdir)/third-party/ \
     5    -D__TRANSMISSION__ \
     6    -DPACKAGE_DATA_DIR=\""$(datadir)"\"
    27
    38AM_CFLAGS = \
    4     $(DHT_CFLAGS) \
    5     $(LIBEVENT_CFLAGS) \
    6     $(LIBCURL_CFLAGS) \
    7     $(OPENSSL_CFLAGS) \
    8     $(PTHREAD_CFLAGS) \
    9     $(ZLIB_CFLAGS)
     9    @DHT_CFLAGS@ \
     10    @LIBEVENT_CFLAGS@ \
     11    @LIBCURL_CFLAGS@ \
     12    @OPENSSL_CFLAGS@ \
     13    @PTHREAD_CFLAGS@ \
     14    @ZLIB_CFLAGS@
    1015
    1116noinst_LIBRARIES = libtransmission.a
     
    123128
    124129apps_ldflags = \
    125     $(ZLIB_LDFLAGS)
     130    @ZLIB_LDFLAGS@
    126131
    127132apps_ldadd = \
     
    129134    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    130135    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    131     $(INTLLIBS) \
    132     $(DHT_LIBS) \
    133     $(LIBEVENT_LIBS) \
    134     $(LIBCURL_LIBS) \
    135     $(OPENSSL_LIBS) \
    136     $(PTHREAD_LIBS) \
    137     $(ZLIB_LIBS)
     136    @INTLLIBS@ \
     137    @DHT_LIBS@ \
     138    @LIBCURL_LIBS@ \
     139    @LIBEVENT_LIBS@ \
     140    @OPENSSL_LIBS@ \
     141    @PTHREAD_LIBS@ \
     142    @ZLIB_LIBS@
    138143
    139144bencode_test_SOURCES = bencode-test.c
Note: See TracChangeset for help on using the changeset viewer.