summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-02-08 14:26:47 +0000
committerChristian Persch <chpe@src.gnome.org>2006-02-08 14:26:47 +0000
commitbfc8ec21731da108340a66d5137da6dc70d55607 (patch)
tree1cc141a3af5537aedf777118542406990ad563d0 /m4
parent91314eee710ec152f392d316547a2eb0a3a4f6f4 (diff)
downloadepiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar.gz
Also build with ff trunk, by explicitly linking with -lxul.
2006-02-08 Christian Persch <chpe@cvs.gnome.org> * configure.ac: * m4/gecko.m4: * src/Makefile.am: Also build with ff trunk, by explicitly linking with -lxul.
Diffstat (limited to 'm4')
-rw-r--r--m4/gecko.m48
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/gecko.m4 b/m4/gecko.m4
index fb9d58ec7..93c3ff991 100644
--- a/m4/gecko.m4
+++ b/m4/gecko.m4
@@ -281,13 +281,17 @@ $1[]_VERSION_MINOR=$gecko_cv_gecko_version_minor
# Packages that we need to check for with pkg-config
# **************************************************
-if test "$gecko_cv_gecko" = "xulrunner" -a "$gecko_cv_gecko_version_major" = "1" -a "$gecko_cv_gecko_version_minor" -ge "9"; then
- gecko_cv_extra_pkg_dependencies=
+gecko_cv_extra_libs=
+gecko_cv_extra_pkg_dependencies=
+
+if test "$gecko_cv_gecko" != "xulrunner" -a "$gecko_cv_gecko_version_major" = "1" -a "$gecko_cv_gecko_version_minor" -ge "9"; then
+ gecko_cv_extra_libs="-lxul"
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"
])