author | Jan Beich <jbeich@tormail.org> |
Tue, 04 Sep 2012 21:01:57 -0400 | |
changeset 104240 | 5567d9cccba45b68bbe46c62c5b97ee8c0a5900d |
parent 104239 | af0971ca7acd8eea374e1961b4cc3625a31e7fa7 |
child 104241 | 4e1c9887f87d20afc5746cc707f1533f79cc77c6 |
push id | 14416 |
push user | ryanvm@gmail.com |
push date | Wed, 05 Sep 2012 01:02:06 +0000 |
treeherder | mozilla-inbound@3f42b1279895 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 788039 |
milestone | 18.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.in +++ b/configure.in @@ -3849,48 +3849,49 @@ else NSPR_CFLAGS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --includedir="${LIBXUL_DIST}/include/nspr" --cflags` NSPR_LIBS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --libdir="${LIBXUL_DIST}"/lib --libs` fi fi dnl system libevent Support dnl ======================================================== MOZ_ARG_WITH_STRING(system-libevent, -[ --with-system-libevent=[PFX] +[ --with-system-libevent[=PFX] Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= +elif test "$LIBEVENT_DIR" = yes; then + PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, + MOZ_NATIVE_LIBEVENT=1, + AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" MOZ_CHECK_HEADER(event.h, [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include]) fi], AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, [MOZ_NATIVE_LIBEVENT=1 - MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS AC_SUBST(MOZ_NATIVE_LIBEVENT) -AC_SUBST(MOZ_LIBEVENT_INCLUDES) +AC_SUBST(MOZ_LIBEVENT_CFLAGS) AC_SUBST(MOZ_LIBEVENT_LIBS) dnl ======================================================== dnl = If NSS was not detected in the system, dnl = use the one in the source tree (mozilla/security/nss) dnl ======================================================== MOZ_ARG_WITH_BOOL(system-nss,