diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-03-01 21:27:51 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-03-01 21:27:51 +0000 |
| commit | 8aa50d0eb1dfbc4471ed5f5069791f6872e3aac5 (patch) | |
| tree | 21a5edb0b4e4ad316cc169a3443c4cad5c562099 | |
| parent | 1d564e92fa2d8888b5478d3faf925d811bd1125d (diff) | |
| download | yelp-8aa50d0eb1dfbc4471ed5f5069791f6872e3aac5.tar.gz | |
Fix libxul[-embedding] detection.
* m4/gecko.m4: Fix libxul[-embedding] detection.
svn path=/trunk/; revision=3223
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | m4/gecko.m4 | 14 |
2 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2009-03-01 Christian Persch <chpe@gnome.org> + + * m4/gecko.m4: Fix libxul[-embedding] detection. + 2009-02-25 Thomas H.P. Andersen <phomes@gmail.com> * src/yelp-base.c (yelp_base_init): diff --git a/m4/gecko.m4 b/m4/gecko.m4 index 6e6136ed..84c47fb4 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -67,6 +67,9 @@ if test -z "$gecko_cv_gecko"; then if $PKG_CONFIG --exists $lizard-xpcom; then gecko_cv_gecko=$lizard break; + elif $PKG_CONFIG --exists $lizard; then + gecko_cv_gecko=$lizard + break; elif $PKG_CONFIG --exists $lizard-unstable; then gecko_cv_gecko=$lizard break; @@ -346,6 +349,16 @@ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then gecko_cv_have_gecko_1_9=yes fi +if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then + PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],[gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001],[gecko_cv_have_gecko_1_9_1=no]) +else + gecko_cv_have_gecko_1_9_1=no +fi + +if test "$gecko_cv_have_gecko_1_9_1" = "yes"; then + AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1]) +fi + fi # if gecko_cv_have_gecko $1[]_VERSION=$gecko_cv_gecko_version @@ -393,6 +406,7 @@ AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_ AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"]) AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"]) AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"]) +AM_CONDITIONAL([HAVE_GECKO_1_9_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_1_9_1" = "yes"]) AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"]) AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"]) AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"]) |