From 7e3d07981cd3862799621f9e94dc965dcad5598c Mon Sep 17 00:00:00 2001 From: paulc Date: Tue, 27 Dec 2005 05:52:30 +0000 Subject: [PATCH] Detect Gtk embedded Mozilla even when provided by Firefox. git-svn-id: http://yate.null.ro/svn/yate/trunk@618 acf43c95-373e-0410-b603-e72c3f656dc1 --- configure.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 77fe7c96..52477212 100644 --- a/configure.in +++ b/configure.in @@ -456,9 +456,14 @@ GMOZ_LIB="" AC_ARG_WITH(gtkmozilla,AC_HELP_STRING([--with-gtkmozilla],[use Mozilla embedded in Gtk clients (default)]),[ac_cv_use_gtkmozilla=$withval],[ac_cv_use_gtkmozilla=yes]) if [[ "x$ac_cv_use_gtkmozilla" = "xyes" ]]; then AC_MSG_CHECKING([for Gtk Mozilla embedding using pkg-config]) - vergmoz=`pkg-config --modversion mozilla-gtkmozembed 2>/dev/null` - incgmoz=`pkg-config --cflags mozilla-gtkmozembed 2>/dev/null` - libgmoz=`pkg-config --libs mozilla-gtkmozembed 2>/dev/null` + mozpkg="mozilla-gtkmozembed" + vergmoz=`pkg-config --modversion $mozpkg 2>/dev/null` + if [[ "x$vergmoz" = "x" ]]; then + mozpkg="mozilla-firefox-gtkmozembed" + vergmoz=`pkg-config --modversion $mozpkg 2>/dev/null` + fi + incgmoz=`pkg-config --cflags $mozpkg 2>/dev/null` + libgmoz=`pkg-config --libs $mozpkg 2>/dev/null` if [[ "x$incgmoz" != "x" -a "x$libgmoz" != "x" ]]; then HAVE_GMOZ=yes GMOZ_INC="$incgmoz"