aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-02-08 22:26:47 +0800
committerChristian Persch <chpe@src.gnome.org>2006-02-08 22:26:47 +0800
commitbfc8ec21731da108340a66d5137da6dc70d55607 (patch)
tree1cc141a3af5537aedf777118542406990ad563d0
parent91314eee710ec152f392d316547a2eb0a3a4f6f4 (diff)
downloadgsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar
gsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar.gz
gsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar.bz2
gsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar.lz
gsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar.xz
gsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.tar.zst
gsoc2013-epiphany-bfc8ec21731da108340a66d5137da6dc70d55607.zip
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.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac1
-rw-r--r--m4/gecko.m48
-rw-r--r--src/Makefile.am1
4 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a37a2c0d8..8025889f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
2006-02-07 Crispin Flowerday <gnome@flowerday.cx>
* src/ephy-extensions-manager.c: (load_extension),
diff --git a/configure.ac b/configure.ac
index c71acebb7..68a6928e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,7 @@ AC_SUBST([MOZILLA_FLAVOUR])
AC_SUBST([MOZILLA_INCLUDE_ROOT])
AC_SUBST([MOZILLA_HOME])
AC_SUBST([MOZILLA_PREFIX])
+AC_SUBST([MOZILLA_EXTRA_LIBS])
case "$MOZILLA" in
mozilla) min_version=1.7.9 ;;
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"
])
diff --git a/src/Makefile.am b/src/Makefile.am
index fd48ee971..5cd77cb2c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -215,6 +215,7 @@ epiphany_LDADD = \
$(top_builddir)/lib/libephymisc.la \
$(top_builddir)/lib/egg/libegg.la \
$(GECKO_LIBS) \
+ $(MOZILLA_EXTRA_LIBS) \
$(DEPENDENCIES_LIBS) \
$(DBUS_LIBS) \
$(LIBINTL)