diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-23 13:08:02 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-23 13:08:02 +0100 |
| commit | 90c5288fef22004d6e4d441b3ae10b9cd1836103 (patch) | |
| tree | 14d4a0e5588e0a04ec4cca52805599ed4abb27fe /old-configure.in | |
| parent | 3624078103303adf0b934734d95a1ed9eb7bfefd (diff) | |
| download | UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.gz UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.lz UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.xz UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.zip | |
Issue #1342 - Remove support for system libevent
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/old-configure.in b/old-configure.in index 9398ef0fc..a98951937 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2006,44 +2006,6 @@ esac MOZ_CONFIG_NSPR() dnl ======================================================== -dnl system libevent Support -dnl ======================================================== -MOZ_ARG_WITH_STRING(system-libevent, -[ --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 "$LIBEVENT_DIR" = yes; then - PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, - MOZ_SYSTEM_LIBEVENT=1, - LIBEVENT_DIR=/usr) -fi -if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_SYSTEM_LIBEVENT= -elif test -z "$MOZ_SYSTEM_LIBEVENT"; then - 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_SYSTEM_LIBEVENT=1 - MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_SYSTEM_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -fi -CFLAGS=$_SAVE_CFLAGS -LDFLAGS=$_SAVE_LDFLAGS -LIBS=$_SAVE_LIBS - -AC_SUBST(MOZ_SYSTEM_LIBEVENT) - -dnl ======================================================== dnl = If NSS was not detected in the system, dnl = use the one in the source tree (mozilla/security/nss) dnl ======================================================== @@ -5624,7 +5586,6 @@ MC_BASILISK=$MC_BASILISK MC_PALEMOON=$MC_PALEMOON MOZ_EME=$MOZ_EME MOZ_WEBRTC=$MOZ_WEBRTC -MOZ_SYSTEM_LIBEVENT=$MOZ_SYSTEM_LIBEVENT MOZ_SYSTEM_NSS=$MOZ_SYSTEM_NSS MOZ_SYSTEM_NSPR=$MOZ_SYSTEM_NSPR MOZ_SYSTEM_JPEG=$MOZ_SYSTEM_JPEG |