From 2edc02176220d96d6386c500afaf4a680dc3a3b9 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 5 Feb 2006 22:42:45 +0000 Subject: Changes to support xulrunner trunk (gecko 1.9). 2006-02-05 Christian Persch * m4/gecko.m4: * configure.ac: * embed/mozilla/Makefile.am: Changes to support xulrunner trunk (gecko 1.9). * embed/mozilla/mozilla-embed-single.cpp: Go back to continuing after failed GetPassword; fixes getting the password list in case one item is corrupted. --- m4/gecko.m4 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'm4') diff --git a/m4/gecko.m4 b/m4/gecko.m4 index a6d456e5a..29c55bd41 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -81,16 +81,19 @@ fi if test "$gecko_cv_have_gecko" = "yes"; then +gecko_cv_extra_pkg_dependencies= + case "$gecko_cv_gecko" in -mozilla) gecko_cv_gecko_flavour=mozilla ;; -seamonkey) gecko_cv_gecko_flavour=mozilla ;; -*firefox) gecko_cv_gecko_flavour=toolkit ;; +mozilla) gecko_cv_gecko_flavour=mozilla gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; +seamonkey) gecko_cv_gecko_flavour=mozilla gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; +*firefox) gecko_cv_gecko_flavour=toolkit gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; +XXxulrunner) gecko_cv_gecko_flavour=toolkit gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; xulrunner) gecko_cv_gecko_flavour=toolkit ;; esac -_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-gtkmozembed`" -_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-gtkmozembed`" -_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-gtkmozembed`" +_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" fi # if gecko_cv_have_gecko -- cgit v1.2.3