Changeset 13199 for trunk/configure.ac


Ignore:
Timestamp:
Feb 4, 2012, 1:28:15 AM (10 years ago)
Author:
jordan
Message:

(trunk) #4732 "allow switching between internal and system libnatpmp" -- fixed with patch scarabeus and applied by me, so any patch breakage is probably mine... ;)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r13193 r13199  
    308308AC_SUBST(LIBUPNP_LIBS)
    309309AC_SUBST(LIBUPNP_LIBS_QT)
     310
     311
     312 
     313
     314dnl ----------------------------------------------------------------------------
     315dnl
     316dnl  Allow usage of system natpmp library
     317
     318LIBNATPMP_CFLAGS="-I\$(top_srcdir)/third-party/libnatpmp/"
     319LIBNATPMP_LIBS="\$(top_builddir)/third-party/libnatpmp/libnatpmp.a"
     320LIBNATPMP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a"
     321build_bundled_natpmp="yes"
     322AC_ARG_ENABLE([external-natpmp],
     323              AS_HELP_STRING([--enable-external-natpmp],[Use system external-natpmp]),
     324              [want_external_natpmp=${enableval}],
     325              [want_external_natpmp=no])
     326if test "x$want_external_natpmp" != "xno" ; then
     327        dnl Would be lovely if it had pkgconfig
     328        LIBNATPMP_CFLAGS="" 
     329        LIBNATPMP_LIBS="-lnatpmp"
     330        LIBNATPMP_LIBS_QT="-lnatpmp"
     331        build_bundled_natpmp="no"
     332fi
     333AM_CONDITIONAL([BUILD_NATPMP],[test "x$build_bundled_natpmp" = "xyes"])
     334AC_SUBST(LIBNATPMP_CFLAGS)
     335AC_SUBST(LIBNATPMP_LIBS)
     336AC_SUBST(LIBNATPMP_LIBS_QT)
    310337
    311338
Note: See TracChangeset for help on using the changeset viewer.