head	1.1;
access;
symbols;
locks; strict;
comment	@# @;


1.1
date	2012.09.10.19.19.32;	author beat;	state Exp;
branches;
next	;


desc
@@


1.1
log
@SVN rev 304053 on 2012-09-10 19:19:32Z by beat

- Move libxul 1.9.2 to www/libxul19
- Update www/libxul to 10.0.7
- Update all dependent ports to use www/libxul19 (no functional changes)
- Bump PORTREVISION on ports where libxul is a run dependency as the
  resulting package will change.

Submitted by:	Jan Beich <jbeich@@tormail.org>
With hat:	gecko
@
text
@# Bug 788039 - With no prefix search libevent via pkg-config.

--- config/autoconf.mk.in~
+++ config/autoconf.mk.in
@@@@ -227,7 +227,7 @@@@ MOZ_HUNSPELL_CFLAGS = @@MOZ_HUNSPELL_CFLA
 
 MOZ_NATIVE_LIBEVENT = @@MOZ_NATIVE_LIBEVENT@@
 MOZ_LIBEVENT_LIBS = @@MOZ_LIBEVENT_LIBS@@
-MOZ_LIBEVENT_INCLUDES = @@MOZ_LIBEVENT_INCLUDES@@
+MOZ_LIBEVENT_CFLAGS = @@MOZ_LIBEVENT_CFLAGS@@
 
 MOZ_NATIVE_LIBVPX = @@MOZ_NATIVE_LIBVPX@@
 MOZ_LIBVPX_LIBS = @@MOZ_LIBVPX_LIBS@@
--- configure.in~
+++ configure.in
@@@@ -3854,7 +3854,7 @@@@ 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)
 
@@@@ -3863,10 +3863,11 @@@@ _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,
@@@@ -3876,16 +3877,16 @@@@ else
         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 ========================================================
@
