diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-12-01 22:02:47 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-12-01 22:02:47 +0000 |
| commit | 4efc04ab51f8e441dae397bff3304d6ceba78785 (patch) | |
| tree | 113a5ac8aed880cd9668411aa1bfc2df174b592d | |
| parent | bc3105a7e91eabf21d8b029b38a41cc222a2c6ab (diff) | |
| download | yelp-4efc04ab51f8e441dae397bff3304d6ceba78785.tar.gz | |
Fix for mozilla API change on trunk.
2006-12-01 Christian Persch <chpe@cvs.gnome.org>
* configure.in:
* m4/gecko.m4:
* src/Makefile.am:
* src/Yelper.cpp:
Fix for mozilla API change on trunk.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | m4/gecko.m4 | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Yelper.cpp | 5 |
5 files changed, 21 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2006-12-01 Christian Persch <chpe@cvs.gnome.org> + + * configure.in: + * m4/gecko.m4: + * src/Makefile.am: + * src/Yelper.cpp: + Fix for mozilla API change on trunk. + ==================== 2.16.2 ==================== 2006-11-20 Don Scorgie <dscorgie@cvs.gnome.org> diff --git a/configure.in b/configure.in index ce92a988..22efed5c 100644 --- a/configure.in +++ b/configure.in @@ -214,6 +214,7 @@ AC_SUBST([MOZILLA_INCLUDE_ROOT]) AC_SUBST([MOZILLA_HOME]) AC_SUBST([MOZILLA_PREFIX]) AC_SUBST([MOZILLA_EXTRA_LIBS]) +AC_SUBST([MOZILLA_GLUE_LIBS]) case "$MOZILLA" in xulrunner) gecko_min_version=1.8 ;; diff --git a/m4/gecko.m4 b/m4/gecko.m4 index 46e19141..506698ad 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 @@ -322,16 +324,19 @@ $1[]_VERSION_INT=$gecko_cv_gecko_version_int # ************************************************** gecko_cv_extra_libs= +gecko_cv_glue_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" + gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" else gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" fi $1[]_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies" $1[]_EXTRA_LIBS="$gecko_cv_extra_libs" +$1[]_GLUE_LIBS="$gecko_cv_glue_libs" ]) diff --git a/src/Makefile.am b/src/Makefile.am index 1b04771e..f8c48782 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,7 +97,8 @@ yelp_LDADD = \ $(BZ_LIBS) \ $(X_LIBS) \ $(MOZILLA_COMPONENT_LIBS) \ - $(MOZILLA_EXTRA_LIBS) + $(MOZILLA_EXTRA_LIBS) \ + $(MOZILLA_GLUE_LIBS) yelp_LDFLAGS = -R$(MOZILLA_HOME) $(AM_LDFLAGS) diff --git a/src/Yelper.cpp b/src/Yelper.cpp index 046c32ce..ef89f9d0 100644 --- a/src/Yelper.cpp +++ b/src/Yelper.cpp @@ -191,7 +191,10 @@ Yelper::FindAgain (PRBool aForward) nsresult rv; PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND; #ifdef HAVE_GECKO_1_9 - rv = mFinder->FindAgain (!aForward, mHasFocus, &found); + rv = mFinder->FindAgain (!aForward, + PR_FALSE /* links only? */, + mHasFocus, + &found); #else if (aForward) { rv = mFinder->FindNext (&found); |