diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-02-05 22:42:45 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-02-05 22:42:45 +0000 |
| commit | 2edc02176220d96d6386c500afaf4a680dc3a3b9 (patch) | |
| tree | 85fb4c46e0bdd071208bc19bdf2c67e7609954d8 /m4 | |
| parent | 0ce928e64a5739138599f82b69a4e43b2634df95 (diff) | |
| download | epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar.gz | |
Changes to support xulrunner trunk (gecko 1.9).
2006-02-05 Christian Persch <chpe@cvs.gnome.org>
* 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.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gecko.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
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 |