diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-12-01 21:29:20 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-12-01 21:29:20 +0000 |
| commit | 4521b7af2f9f9b9019486cb0ed9cdade37b6fd50 (patch) | |
| tree | c7dd23cb8c8a85c1b43878fd97ccee8bbd92a916 /m4 | |
| parent | fb2c1c3d03f4333971eb1048bd3992ba20f45577 (diff) | |
| download | epiphany-4521b7af2f9f9b9019486cb0ed9cdade37b6fd50.tar.gz | |
Another mozilla API change.
2006-12-01 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed-find.c: (ephy_embed_find_find_again):
* embed/ephy-embed-find.h:
* embed/mozilla/EphyFind.cpp:
* embed/mozilla/EphyFind.h:
* embed/mozilla/mozilla-embed-find.cpp:
* src/ephy-find-toolbar.c: (ephy_find_toolbar_find_next),
(ephy_find_toolbar_find_previous):
Another mozilla API change.
* m4/gecko.m4:
Add -lxpcomglue_s to EXTRA_LIBS on trunk.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gecko.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/m4/gecko.m4 b/m4/gecko.m4 index 46e191415..cefb65215 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -96,6 +96,7 @@ xulrunner) gecko_cv_gecko_flavour=toolkit ;; esac _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" @@ -110,6 +111,7 @@ AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_gecko_flavour" = "toolkit $1[]=$gecko_cv_gecko $1[]_FLAVOUR=$gecko_cv_gecko_flavour $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT +$1[]_LIBDIR=$_GECKO_LIBDIR $1[]_HOME=$_GECKO_HOME $1[]_PREFIX=$_GECKO_PREFIX @@ -325,7 +327,7 @@ gecko_cv_extra_libs= gecko_cv_extra_pkg_dependencies= if test "$gecko_cv_gecko_version_int" -ge "1009000"; then - gecko_cv_extra_libs="-lxul" + gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul -lxpcomglue_s" else gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" fi |