mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-09 21:54:09 +00:00
Code Issues Releases Wiki Activity

(trunk) if libevent exists on the system, use it. otherwise, use our own copy.

Browse source
This commit is contained in:
Charles Kerr 2009-06-03 16:31:43 +00:00
parent 8e6eee683f
commit 2ccee6c2d3
2 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
configure.ac
View file

@ -166,21 +166,19 @@ AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
])
dnl let's try using the system's libevent now
dnl
dnl ----------------------------------------------------------------------------
dnl
dnl libevent fun
dnl
dnl we have to add the builddir into the include path because event-config.h
dnl is generated when libevent is build
dnl
dnl AC_CONFIG_SUBDIRS([third-party/libevent])
dnl AC_MSG_NOTICE([invoking libevent's configure script])
dnl LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
dnl AC_SUBST(LIBEVENT_CPPFLAGS)
LIBEVENT_LIBS="-levent"
AC_CHECK_HEADER([event-config.h],
[libevent_source=system
LIBEVENT_CPPFLAGS=""
LIBEVENT_LIBS="-levent"],
[libevent_source=bundled
AC_CONFIG_SUBDIRS([third-party/libevent])
AC_MSG_NOTICE([libevent not found on system, so we'll build our own from third-party/libevent/.])
AC_MSG_NOTICE([if you are cross-compiling this is probably not what you want.])
LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/.libs/libevent.a"
AC_SUBST(LIBEVENT_CPPFLAGS)])
AM_CONDITIONAL([BUILD_LIBEVENT], [test x$libevent_source = xbundled])
AC_SUBST(LIBEVENT_CPPFLAGS)
AC_SUBST(LIBEVENT_LIBS)
@ -377,14 +375,16 @@ echo "
Configuration:
Source code location: ${srcdir}
Compiler: ${CXX}
Build Command-Line client: ${build_cli}
Build Daemon: ${build_daemon}
Build GTK+ client: ${build_gtk}
... gio support: ${use_gio}
... dbus-glib support: ${use_dbus_glib}
... libnotify support: ${use_libnotify}
Build OS X client: ${build_mac}
Source code location: ${srcdir}
Compiler: ${CXX}
System or bundled libevent: ${libevent_source}
Build OS X client: ${build_mac}
Build GTK+ client: ${build_gtk}
... with gio support: ${use_gio}
... with dbus-glib support: ${use_dbus_glib}
... with libnotify support: ${use_libnotify}
Build Command-Line client: ${build_cli}
Build Daemon: ${build_daemon}
"

12
third-party/Makefile.am vendored
View file

@ -1,7 +1,11 @@
SUBDIRS = \
libnatpmp \
miniupnp \
dht
if BUILD_LIBEVENT
LIBEVENT_DIR = libevent
else
LIBEVENT_DIR =
endif
SUBDIRS = libnatpmp miniupnp dht $(LIBEVENT_DIR)
EXTRA_DIST = \
libevent \