Changeset 9795 for trunk/configure.ac


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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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)
Note: See TracChangeset for help on using the changeset viewer.