diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-12-18 20:39:39 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-12-18 20:39:39 +0000 |
| commit | 1741c515eda8918bebe8844beb4cd32cbdd6aa58 (patch) | |
| tree | c4612bdf7d99921fa7bf7e52b19b4a5b27f8d504 | |
| parent | bf6e7073bb05741c865cf9efee9ec387acdee4b9 (diff) | |
| download | epiphany-RELEASE_2_17_4.tar.gz | |
=== Release 2.17.4 ===RELEASE_2_17_4
2006-12-18 Christian Persch <chpe@cvs.gnome.org>
=== Release 2.17.4 ===
* autogen.sh:
* configure.ac:
* src/Makefile.am:
Link with -lxpcomglue_s on trunk.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
4 files changed, 14 insertions, 4 deletions
@@ -1,4 +1,14 @@ 2006-12-18 Christian Persch <chpe@cvs.gnome.org> + + === Release 2.17.4 === + + * autogen.sh: + * configure.ac: + * src/Makefile.am: + + Link with -lxpcomglue_s on trunk. + +2006-12-18 Christian Persch <chpe@cvs.gnome.org> * lib/widgets/ephy-location-entry.c: (ephy_location_entry_set_completion): diff --git a/autogen.sh b/autogen.sh index 0f5706350..7177c5166 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,10 +5,8 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="epiphany" -REQUIRED_AUTOMAKE_VERSION=1.9 -(test -f $srcdir/configure.ac \ - && test -f $srcdir/src/ephy-window.c) || { +(test -f $srcdir/src/ephy-window.c) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level $PKG_NAME directory" exit 1 @@ -20,4 +18,4 @@ which gnome-autogen.sh || { exit 1 } -USE_GNOME2_MACROS=1 . gnome-autogen.sh +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.ac b/configure.ac index 20a6b4b0a..abb38e663 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ AC_SUBST([MOZILLA_INCLUDE_ROOT]) AC_SUBST([MOZILLA_HOME]) AC_SUBST([MOZILLA_PREFIX]) AC_SUBST([MOZILLA_EXTRA_LIBS]) +AC_SUBST([MOZILLA_GLUE_LIBS]) if test "$gecko_cv_gecko_version_int" -lt "1008000"; then AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!]) diff --git a/src/Makefile.am b/src/Makefile.am index fc21eb581..b944c3152 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -216,6 +216,7 @@ epiphany_LDADD = \ $(top_builddir)/lib/egg/libegg.la \ $(GECKO_LIBS) \ $(MOZILLA_EXTRA_LIBS) \ + $(MOZILLA_GLUE_LIBS) \ $(DEPENDENCIES_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) |