r17537 - in /desktop/experimental/epiphany-browser/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 14 00:43:00 UTC 2008
Author: joss
Date: Fri Nov 14 00:43:00 2008
New Revision: 17537
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17537
Log:
* New upstream release.
+ Fixes Danish translation. Closes: #469559.
+ Hopefully fixes the loss of component registration.
Closes: #494058.
* Pass --disable-maintainer-mode.
* Update build-dependencies.
* Remove 2.22 specificities (from the gecko 1.9 migration) in
dependencies.
* Remove patches merged upstream:
+ 10_url_double-click.patch
+ 14_zoom-crash.patch
+ 15_certificates_oldapi.patch
+ 16_fix-notify-uninit-crash.patch
+ 17_print-scaling.patch
+ 19_passwords_crash.patch
* Remove 18_gnome-vfs-for-helper-display.patch and drop gnome-vfs
build dependency; gio is now the default method.
* Refresh and update other patches.
* Regenerate 99_autoreconf.patch.
* Pass --as-needed to LDFLAGS. Closes: #479427.
+ Introduce 99_ltmain_as-needed.patch.
Added:
desktop/experimental/epiphany-browser/debian/patches/99_ltmain_as-needed.patch
Removed:
desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch
desktop/experimental/epiphany-browser/debian/patches/14_zoom-crash.patch
desktop/experimental/epiphany-browser/debian/patches/15_certificates_oldapi.patch
desktop/experimental/epiphany-browser/debian/patches/16_fix-notify-uninit-crash.patch
desktop/experimental/epiphany-browser/debian/patches/17_print-scaling.patch
desktop/experimental/epiphany-browser/debian/patches/18_gnome-vfs-for-helper-display.patch
desktop/experimental/epiphany-browser/debian/patches/19_passwords_crash.patch
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch
desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/experimental/epiphany-browser/debian/patches/series
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Fri Nov 14 00:43:00 2008
@@ -1,3 +1,29 @@
+epiphany-browser (2.24.1-1) experimental; urgency=low
+
+ * New upstream release.
+ + Fixes Danish translation. Closes: #469559.
+ + Hopefully fixes the loss of component registration.
+ Closes: #494058.
+ * Pass --disable-maintainer-mode.
+ * Update build-dependencies.
+ * Remove 2.22 specificities (from the gecko 1.9 migration) in
+ dependencies.
+ * Remove patches merged upstream:
+ + 10_url_double-click.patch
+ + 14_zoom-crash.patch
+ + 15_certificates_oldapi.patch
+ + 16_fix-notify-uninit-crash.patch
+ + 17_print-scaling.patch
+ + 19_passwords_crash.patch
+ * Remove 18_gnome-vfs-for-helper-display.patch and drop gnome-vfs
+ build dependency; gio is now the default method.
+ * Refresh and update other patches.
+ * Regenerate 99_autoreconf.patch.
+ * Pass --as-needed to LDFLAGS. Closes: #479427.
+ + Introduce 99_ltmain_as-needed.patch.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 14 Nov 2008 00:21:27 +0100
+
epiphany-browser (2.22.3-7) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Fri Nov 14 00:43:00 2008
@@ -5,17 +5,17 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5),
pkg-config,
- libglib2.0-dev (>= 2.16.0),
- libgtk2.0-dev (>= 2.12.0),
+ libglib2.0-dev (>= 2.18.0),
+ libgtk2.0-dev (>= 2.14.0),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libglade2-dev (>= 2.3.1),
libgnome2-dev (>= 2.14.0),
libgnomeui-dev (>= 2.16.0-2),
- libgnomevfs2-dev (>= 2.9.2),
libgconf2-dev,
libgnome-desktop-dev (>= 2.9.91),
libstartup-notification0-dev (>= 0.5),
+ libcanberra-gtk-dev (>= 0.3),
libnotify-dev (>= 0.4),
libdbus-glib-1-dev (>= 0.60),
scrollkeeper,
@@ -27,7 +27,7 @@
python-gtk2-dev (>= 2.7.1),
python-gnome2-dev (>= 2.6.0),
gnome-doc-utils (>= 0.3.2),
- intltool (>= 0.35.0),
+ intltool (>= 0.40.0),
x11proto-core-dev,
network-manager-dev | not+linux-gnu,
quilt,
@@ -52,7 +52,7 @@
Package: epiphany-gecko
Architecture: any
-Depends: epiphany-browser-data (>= 2.22.1.1-3),
+Depends: epiphany-browser-data (>= ${gnome:NextVersion}),
epiphany-browser-data (<< ${gnome:NextVersion}),
${shlibs:Depends},
gnome-icon-theme (>= 2.9.90),
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Fri Nov 14 00:43:00 2008
@@ -5,17 +5,17 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
pkg-config,
- libglib2.0-dev (>= 2.16.0),
- libgtk2.0-dev (>= 2.12.0),
+ libglib2.0-dev (>= 2.18.0),
+ libgtk2.0-dev (>= 2.14.0),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libglade2-dev (>= 2.3.1),
libgnome2-dev (>= 2.14.0),
libgnomeui-dev (>= 2.16.0-2),
- libgnomevfs2-dev (>= 2.9.2),
libgconf2-dev,
libgnome-desktop-dev (>= 2.9.91),
libstartup-notification0-dev (>= 0.5),
+ libcanberra-gtk-dev (>= 0.3),
libnotify-dev (>= 0.4),
libdbus-glib-1-dev (>= 0.60),
scrollkeeper,
@@ -27,7 +27,7 @@
python-gtk2-dev (>= 2.7.1),
python-gnome2-dev (>= 2.6.0),
gnome-doc-utils (>= 0.3.2),
- intltool (>= 0.35.0),
+ intltool (>= 0.40.0),
x11proto-core-dev,
network-manager-dev | not+linux-gnu,
quilt,
@@ -52,7 +52,7 @@
Package: epiphany-gecko
Architecture: any
-Depends: epiphany-browser-data (>= 2.22.1.1-3),
+Depends: epiphany-browser-data (>= ${gnome:NextVersion}),
epiphany-browser-data (<< ${gnome:NextVersion}),
${shlibs:Depends},
gnome-icon-theme (>= 2.9.90),
Modified: desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch Fri Nov 14 00:43:00 2008
@@ -1,10 +1,10 @@
-Index: epiphany-2.22.2/configure.ac
+Index: epiphany-2.24.1/configure.ac
===================================================================
---- epiphany-2.22.2.orig/configure.ac 2008-05-27 14:16:28.745651053 +0200
-+++ epiphany-2.22.2/configure.ac 2008-05-27 14:16:32.833154773 +0200
+--- epiphany-2.24.1.orig/configure.ac 2008-10-19 14:52:49.000000000 +0200
++++ epiphany-2.24.1/configure.ac 2008-11-14 00:28:34.598987162 +0100
@@ -25,7 +25,7 @@ m4_define([epiphany_build_id],[20080528]
# This can be either "trunk" or "branches/gnome-x-y"
- m4_define([epiphany_branch],["branches/gnome-2-22"])
+ m4_define([epiphany_branch],["branches/gnome-2-24"])
-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
Modified: desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch Fri Nov 14 00:43:00 2008
@@ -1,11 +1,12 @@
-Index: epiphany-browser-2.21.4/data/default-prefs-common.js
+Index: epiphany-2.24.1/data/default-prefs-common.js
===================================================================
---- epiphany-browser-2.21.4.orig/data/default-prefs-common.js 2007-11-12 10:48:23.000000000 +0000
-+++ epiphany-browser-2.21.4/data/default-prefs-common.js 2008-01-14 21:47:03.000000000 +0000
-@@ -171,3 +171,6 @@
- // set to true for parity with gtk entries
- pref("bidi.edit.delete_immediately", true);
-
+--- epiphany-2.24.1.orig/data/default-prefs-common.js 2008-10-19 14:58:21.000000000 +0200
++++ epiphany-2.24.1/data/default-prefs-common.js 2008-11-14 00:30:11.513240091 +0100
+@@ -195,3 +195,7 @@ pref("places.frecency.tempRedirectVisitB
+ pref("places.frecency.defaultVisitBonus", 0);
+ pref("places.frecency.unvisitedBookmarkBonus", 0);
+ pref("places.frecency.unvisitedTypedBonus", 0);
++
+// enable weak SSL ciphers, as Epiphany warns about them anyway
+pref("security.ssl3.rsa_rc4_40_md5", true);
+pref("security.ssl3.rsa_rc2_40_md5", true);
Modified: desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch Fri Nov 14 00:43:00 2008
@@ -1,7 +1,7 @@
-Index: epiphany-2.22.3/data/glade/prefs-dialog.glade
+Index: epiphany-2.24.1/data/glade/prefs-dialog.glade
===================================================================
---- epiphany-2.22.3.orig/data/glade/prefs-dialog.glade 2007-11-12 12:44:38.000000000 +0100
-+++ epiphany-2.22.3/data/glade/prefs-dialog.glade 2008-07-02 10:29:42.732947528 +0200
+--- epiphany-2.24.1.orig/data/glade/prefs-dialog.glade 2008-09-22 20:38:32.000000000 +0200
++++ epiphany-2.24.1/data/glade/prefs-dialog.glade 2008-11-14 00:30:49.210988479 +0100
@@ -303,6 +303,25 @@
<property name="spacing">6</property>
@@ -54,11 +54,11 @@
</widget>
</child>
</widget>
-Index: epiphany-2.22.3/embed/mozilla/ContentHandler.cpp
+Index: epiphany-2.24.1/embed/mozilla/ContentHandler.cpp
===================================================================
---- epiphany-2.22.3.orig/embed/mozilla/ContentHandler.cpp 2008-06-30 12:30:32.000000000 +0200
-+++ epiphany-2.22.3/embed/mozilla/ContentHandler.cpp 2008-07-02 10:29:42.732947528 +0200
-@@ -368,6 +368,7 @@
+--- epiphany-2.24.1.orig/embed/mozilla/ContentHandler.cpp 2008-08-31 13:38:12.000000000 +0200
++++ epiphany-2.24.1/embed/mozilla/ContentHandler.cpp 2008-11-14 00:30:49.210988479 +0100
+@@ -372,6 +372,7 @@ NS_METHOD GContentHandler::MIMEConfirmAc
NS_METHOD GContentHandler::MIMEInitiateAction (void)
{
gboolean auto_downloads;
@@ -66,7 +66,7 @@
if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) return NS_OK;
-@@ -390,23 +391,18 @@
+@@ -394,23 +395,18 @@ NS_METHOD GContentHandler::MIMEInitiateA
}
}
@@ -95,11 +95,11 @@
{
MIMEConfirmAction ();
}
-Index: epiphany-2.22.3/src/prefs-dialog.c
+Index: epiphany-2.24.1/src/prefs-dialog.c
===================================================================
---- epiphany-2.22.3.orig/src/prefs-dialog.c 2008-03-28 15:59:50.000000000 +0100
-+++ epiphany-2.22.3/src/prefs-dialog.c 2008-07-02 10:29:42.732947528 +0200
-@@ -362,6 +362,13 @@
+--- epiphany-2.24.1.orig/src/prefs-dialog.c 2008-08-03 14:23:09.000000000 +0200
++++ epiphany-2.24.1/src/prefs-dialog.c 2008-11-14 00:30:49.210988479 +0100
+@@ -345,6 +345,13 @@ prefs_dialog_show_help (EphyDialog *dial
}
static void
@@ -113,7 +113,7 @@
setup_font_combo (EphyDialog *dialog,
const char *type,
const char *code,
-@@ -1491,6 +1498,7 @@
+@@ -1474,6 +1481,7 @@ prefs_dialog_init (PrefsDialog *pd)
EphyDialog *dialog = EPHY_DIALOG (pd);
EphyEncodings *encodings;
GtkWidget *window, *curr_button, *blank_button;
@@ -121,7 +121,7 @@
GtkWidget *clear_cache_button, *font_prefs_button;
GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
gboolean sensitive;
-@@ -1511,6 +1519,8 @@
+@@ -1494,6 +1502,8 @@ prefs_dialog_init (PrefsDialog *pd)
properties[WINDOW_PROP].id, &window,
properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
@@ -130,7 +130,7 @@
properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
-@@ -1534,6 +1544,10 @@
+@@ -1517,6 +1527,10 @@ prefs_dialog_init (PrefsDialog *pd)
gtk_widget_set_sensitive (curr_button, sensitive);
gtk_widget_set_sensitive (blank_button, sensitive);
Modified: desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch Fri Nov 14 00:43:00 2008
@@ -2,1489 +2,33 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-2.22.3/aclocal.m4
+Index: epiphany-2.24.1/aclocal.m4
===================================================================
---- epiphany-2.22.3.orig/aclocal.m4 2008-06-30 19:02:16.000000000 +0100
-+++ epiphany-2.22.3/aclocal.m4 2008-09-14 15:54:04.000000000 +0100
-@@ -59,322 +59,755 @@
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
- ])
+--- epiphany-2.24.1.orig/aclocal.m4 2008-10-19 14:53:29.000000000 +0200
++++ epiphany-2.24.1/aclocal.m4 2008-11-14 00:40:02.603485639 +0100
+@@ -688,7 +688,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
--# gnome-common.m4
--#
--
--dnl GNOME_COMMON_INIT
-+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# This file can be copied and used freely without restrictions. It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
-+#
-+# Modified to never use included libintl.
-+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
-+#
-+# Major rework to remove unused code
-+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
-+#
-+# Added better handling of ALL_LINGUAS from GNU gettext version
-+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-+#
-+# Modified to require ngettext
-+# Matthias Clasen <mclasen at redhat.com> 08/06/2004
-+#
-+# We need this here as well, since someone might use autoconf-2.5x
-+# to configure GLib then an older version to configure a package
-+# using AM_GLIB_GNU_GETTEXT
-+AC_PREREQ(2.53)
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--AC_DEFUN([GNOME_COMMON_INIT],
--[
-- dnl this macro should come after AC_CONFIG_MACRO_DIR
-- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-+dnl
-+dnl We go to great lengths to make sure that aclocal won't
-+dnl try to pull in the installed version of these macros
-+dnl when running aclocal in the glib directory.
-+dnl
-+m4_copy([AC_DEFUN],[glib_DEFUN])
-+m4_copy([AC_REQUIRE],[glib_REQUIRE])
-+dnl
-+dnl At the end, if we're not within glib, we'll define the public
-+dnl definitions in terms of our private definitions.
-+dnl
-
-- dnl ensure that when the Automake generated makefile calls aclocal,
-- dnl it honours the $ACLOCAL_FLAGS environment variable
-- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-- if test -n "$ac_macro_dir"; then
-- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-- fi
-+# GLIB_LC_MESSAGES
-+#--------------------
-+glib_DEFUN([GLIB_LC_MESSAGES],
-+ [AC_CHECK_HEADERS([locale.h])
-+ if test $ac_cv_header_locale_h = yes; then
-+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+ if test $am_cv_val_LC_MESSAGES = yes; then
-+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+ [Define if your <locale.h> file defines LC_MESSAGES.])
-+ fi
-+ fi])
-
-- AC_SUBST([ACLOCAL_AMFLAGS])
-+# GLIB_PATH_PROG_WITH_TEST
-+#----------------------------
-+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+ /*)
-+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if [$3]; then
-+ ac_cv_path_$1="$ac_dir/$ac_word"
-+ break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+ ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+ AC_MSG_RESULT([$]$1)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
- ])
-
--AC_DEFUN([GNOME_DEBUG_CHECK],
--[
-- AC_ARG_ENABLE([debug],
-- AC_HELP_STRING([--enable-debug],
-- [turn on debugging]),,
-- [enable_debug=no])
-+# GLIB_WITH_NLS
-+#-----------------
-+glib_DEFUN([GLIB_WITH_NLS],
-+ dnl NLS is obligatory
-+ [USE_NLS=yes
-+ AC_SUBST(USE_NLS)
-
-- if test x$enable_debug = xyes ; then
-- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-- [Enable additional debugging at the expense of performance and size])
-- fi
--])
-+ gt_cv_have_gettext=no
-
--dnl GNOME_MAINTAINER_MODE_DEFINES ()
--dnl define DISABLE_DEPRECATED
--dnl
--AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
--[
-- AC_REQUIRE([AM_MAINTAINER_MODE])
-+ CATOBJEXT=NONE
-+ XGETTEXT=:
-+ INTLLIBS=
-
-- if test $USE_MAINTAINER_MODE = yes; then
-- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
-- else
-- DISABLE_DEPRECATED=""
-- fi
-- AC_SUBST(DISABLE_DEPRECATED)
--])
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
-
--dnl GNOME_COMPILE_WARNINGS
--dnl Turn on many useful compiler warnings
--dnl For now, only works on GCC
--AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-- dnl ******************************
-- dnl More compiler warnings
-- dnl ******************************
-+ #
-+ # First check in libc
-+ #
-+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !ngettext ("","", 1)],
-+ gt_cv_func_ngettext_libc=yes,
-+ gt_cv_func_ngettext_libc=no)
-+ ])
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !dgettext ("","")],
-+ gt_cv_func_dgettext_libc=yes,
-+ gt_cv_func_dgettext_libc=no)
-+ ])
-+ fi
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ fi
-
-- AC_ARG_ENABLE(compile-warnings,
-- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-- [Turn on compiler warnings]),,
-- [enable_compile_warnings="m4_default([$1],[yes])"])
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
-- warning_flags=
-- realsave_CFLAGS="$CFLAGS"
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
-- case "$enable_compile_warnings" in
-- no)
-- warning_flags=
-- ;;
-- minimum)
-- warning_flags="-Wall"
-- ;;
-- yes)
-- warning_flags="-Wall -Wmissing-prototypes"
-- ;;
-- maximum|error)
-- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-- CFLAGS="$warning_flags $CFLAGS"
-- for option in -Wno-sign-compare; do
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS $option"
-- AC_MSG_CHECKING([whether gcc understands $option])
-- AC_TRY_COMPILE([], [],
-- has_option=yes,
-- has_option=no,)
-- CFLAGS="$SAVE_CFLAGS"
-- AC_MSG_RESULT($has_option)
-- if test $has_option = yes; then
-- warning_flags="$warning_flags $option"
-- fi
-- unset has_option
-- unset SAVE_CFLAGS
-- done
-- unset option
-- if test "$enable_compile_warnings" = "error" ; then
-- warning_flags="$warning_flags -Werror"
-- fi
-- ;;
-- *)
-- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-- ;;
-- esac
-- CFLAGS="$realsave_CFLAGS"
-- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-- AC_MSG_RESULT($warning_flags)
--
-- AC_ARG_ENABLE(iso-c,
-- AC_HELP_STRING([--enable-iso-c],
-- [Try to warn if code is not ISO C ]),,
-- [enable_iso_c=no])
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
-+ fi
-
-- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-- complCFLAGS=
-- if test "x$enable_iso_c" != "xno"; then
-- if test "x$GCC" = "xyes"; then
-- case " $CFLAGS " in
-- *[\ \ ]-ansi[\ \ ]*) ;;
-- *) complCFLAGS="$complCFLAGS -ansi" ;;
-- esac
-- case " $CFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCFLAGS="$complCFLAGS -pedantic" ;;
-- esac
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ gt_cv_have_gettext=yes
-+ fi
-+
-+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ INTLLIBS="-lintl $libintl_extra_libs"
-+ fi
-+
-+ if test "$gt_cv_have_gettext" = "yes"; then
-+ AC_DEFINE(HAVE_GETTEXT,1,
-+ [Define if the GNU gettext() function is already present or preinstalled.])
-+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+ if test "$MSGFMT" != "no"; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS $INTLLIBS"
-+ AC_CHECK_FUNCS(dcgettext)
-+ MSGFMT_OPTS=
-+ AC_MSG_CHECKING([if msgfmt accepts -c])
-+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo at bar.xx>\n"
-+"Language-Team: C <LL at li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-+ AC_SUBST(MSGFMT_OPTS)
-+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr],
-+ [CATOBJEXT=.gmo
-+ DATADIRNAME=share],
-+ [case $host in
-+ *-*-solaris*)
-+ dnl On Solaris, if bind_textdomain_codeset is in libc,
-+ dnl GNU format message catalog is always supported,
-+ dnl since both are added to the libc all together.
-+ dnl Hence, we'd like to go with DATADIRNAME=share and
-+ dnl and CATOBJEXT=.gmo in this case.
-+ AC_CHECK_FUNC(bind_textdomain_codeset,
-+ [CATOBJEXT=.gmo
-+ DATADIRNAME=share],
-+ [CATOBJEXT=.mo
-+ DATADIRNAME=lib])
-+ ;;
-+ *)
-+ CATOBJEXT=.mo
-+ DATADIRNAME=lib
-+ ;;
-+ esac])
-+ LIBS="$glib_save_LIBS"
-+ INSTOBJEXT=.mo
-+ else
-+ gt_cv_have_gettext=no
- fi
-+ fi
-+ ])
-+
-+ if test "$gt_cv_have_gettext" = "yes" ; then
-+ AC_DEFINE(ENABLE_NLS, 1,
-+ [always defined to indicate that i18n is enabled])
- fi
-- AC_MSG_RESULT($complCFLAGS)
-
-- WARN_CFLAGS="$warning_flags $complCFLAGS"
-- AC_SUBST(WARN_CFLAGS)
--])
-+ dnl Test whether we really found GNU xgettext.
-+ if test "$XGETTEXT" != ":"; then
-+ dnl If it is not GNU xgettext we define it as : so that the
-+ dnl Makefiles still can work.
-+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+ : ;
-+ else
-+ AC_MSG_RESULT(
-+ [found xgettext program is not GNU xgettext; ignore it])
-+ XGETTEXT=":"
-+ fi
-+ fi
-
--dnl For C++, do basically the same thing.
-+ # We need to process the po/ directory.
-+ POSUB=po
-
--AC_DEFUN([GNOME_CXX_WARNINGS],[
-- AC_ARG_ENABLE(cxx-warnings,
-- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-- [Turn on compiler warnings.]),,
-- [enable_cxx_warnings="m4_default([$1],[minimum])"])
-+ AC_OUTPUT_COMMANDS(
-+ [case "$CONFIG_FILES" in *po/Makefile.in*)
-+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+ esac])
-
-- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-- warnCXXFLAGS=
-- if test "x$GXX" != xyes; then
-- enable_cxx_warnings=no
-- fi
-- if test "x$enable_cxx_warnings" != "xno"; then
-- if test "x$GXX" = "xyes"; then
-- case " $CXXFLAGS " in
-- *[\ \ ]-Wall[\ \ ]*) ;;
-- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-- esac
-+ dnl These rules are solely for the distribution goal. While doing this
-+ dnl we only have to keep exactly one list of the available catalogs
-+ dnl in configure.in.
-+ for lang in $ALL_LINGUAS; do
-+ GMOFILES="$GMOFILES $lang.gmo"
-+ POFILES="$POFILES $lang.po"
-+ done
-
-- ## -W is not all that useful. And it cannot be controlled
-- ## with individual -Wno-xxx flags, unlike -Wall
-- if test "x$enable_cxx_warnings" = "xyes"; then
-- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-- fi
-- fi
-- fi
-- AC_MSG_RESULT($warnCXXFLAGS)
-+ dnl Make all variables we use known to autoconf.
-+ AC_SUBST(CATALOGS)
-+ AC_SUBST(CATOBJEXT)
-+ AC_SUBST(DATADIRNAME)
-+ AC_SUBST(GMOFILES)
-+ AC_SUBST(INSTOBJEXT)
-+ AC_SUBST(INTLLIBS)
-+ AC_SUBST(PO_IN_DATADIR_TRUE)
-+ AC_SUBST(PO_IN_DATADIR_FALSE)
-+ AC_SUBST(POFILES)
-+ AC_SUBST(POSUB)
-+ ])
-
-- AC_ARG_ENABLE(iso-cxx,
-- AC_HELP_STRING([--enable-iso-cxx],
-- [Try to warn if code is not ISO C++ ]),,
-- [enable_iso_cxx=no])
-+# AM_GLIB_GNU_GETTEXT
-+# -------------------
-+# Do checks necessary for use of gettext. If a suitable implementation
-+# of gettext is found in either in libintl or in the C library,
-+# it will set INTLLIBS to the libraries needed for use of gettext
-+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-+# on various variables needed by the Makefile.in.in installed by
-+# glib-gettextize.
-+dnl
-+glib_DEFUN([GLIB_GNU_GETTEXT],
-+ [AC_REQUIRE([AC_PROG_CC])dnl
-+ AC_REQUIRE([AC_HEADER_STDC])dnl
-+
-+ GLIB_LC_MESSAGES
-+ GLIB_WITH_NLS
-
-- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-- complCXXFLAGS=
-- if test "x$enable_iso_cxx" != "xno"; then
-- if test "x$GXX" = "xyes"; then
-- case " $CXXFLAGS " in
-- *[\ \ ]-ansi[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-- esac
-+ if test "$gt_cv_have_gettext" = "yes"; then
-+ if test "x$ALL_LINGUAS" = "x"; then
-+ LINGUAS=
-+ else
-+ AC_MSG_CHECKING(for catalogs to be installed)
-+ NEW_LINGUAS=
-+ for presentlang in $ALL_LINGUAS; do
-+ useit=no
-+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-+ desiredlanguages="$LINGUAS"
-+ else
-+ desiredlanguages="$ALL_LINGUAS"
-+ fi
-+ for desiredlang in $desiredlanguages; do
-+ # Use the presentlang catalog if desiredlang is
-+ # a. equal to presentlang, or
-+ # b. a variant of presentlang (because in this case,
-+ # presentlang can be used as a fallback for messages
-+ # which are not translated in the desiredlang catalog).
-+ case "$desiredlang" in
-+ "$presentlang"*) useit=yes;;
-+ esac
-+ done
-+ if test $useit = yes; then
-+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-+ fi
-+ done
-+ LINGUAS=$NEW_LINGUAS
-+ AC_MSG_RESULT($LINGUAS)
-+ fi
-
-- case " $CXXFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-- esac
-+ dnl Construct list of names of catalog files to be constructed.
-+ if test -n "$LINGUAS"; then
-+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-- AC_MSG_RESULT($complCXXFLAGS)
--
-- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-- AC_SUBST(WARN_CXXFLAGS)
--])
--
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
-
-+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+ dnl Try to locate is.
-+ MKINSTALLDIRS=
-+ if test -n "$ac_aux_dir"; then
-+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+ fi
-+ if test -z "$MKINSTALLDIRS"; then
-+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ fi
-+ AC_SUBST(MKINSTALLDIRS)
-
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
-- [],
-- [m4_define([AC_PROVIDE_IFELSE],
-- [m4_ifdef([AC_PROVIDE_$1],
-- [$2], [$3])])])
-+ dnl Generate list of files to be processed by xgettext which will
-+ dnl be included in po/Makefile.
-+ test -d po || mkdir po
-+ if test "x$srcdir" != "x."; then
-+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+ posrcprefix="$srcdir/"
-+ else
-+ posrcprefix="../$srcdir/"
-+ fi
-+ else
-+ posrcprefix="../"
-+ fi
-+ rm -f po/POTFILES
-+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+ < $srcdir/po/POTFILES.in > po/POTFILES
-+ ])
-
-+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-+# -------------------------------
-+# Define VARIABLE to the location where catalog files will
-+# be installed by po/Makefile.
-+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-+glib_save_prefix="$prefix"
-+glib_save_exec_prefix="$exec_prefix"
-+glib_save_datarootdir="$datarootdir"
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+datarootdir=`eval echo "${datarootdir}"`
-+if test "x$CATOBJEXT" = "x.mo" ; then
-+ localedir=`eval echo "${libdir}/locale"`
-+else
-+ localedir=`eval echo "${datadir}/locale"`
-+fi
-+prefix="$glib_save_prefix"
-+exec_prefix="$glib_save_exec_prefix"
-+datarootdir="$glib_save_datarootdir"
-+AC_DEFINE_UNQUOTED($1, "$localedir",
-+ [Define the location where the catalogs will be installed])
-+])
-
--# AC_PROG_LIBTOOL
--# ---------------
--AC_DEFUN([AC_PROG_LIBTOOL],
--[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
--dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
--dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-- AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [AC_LIBTOOL_CXX],
-- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-- ])])
--dnl And a similar setup for Fortran 77 support
-- AC_PROVIDE_IFELSE([AC_PROG_F77],
-- [AC_LIBTOOL_F77],
-- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
--])])
-+dnl
-+dnl Now the definitions that aclocal will find
-+dnl
-+ifdef(glib_configure_in,[],[
-+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-+])dnl
-
--dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
--dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
--dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-- [AC_LIBTOOL_GCJ],
-- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-- [AC_LIBTOOL_GCJ],
-- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-- [AC_LIBTOOL_GCJ],
-- [ifdef([AC_PROG_GCJ],
-- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-- ifdef([A][M_PROG_GCJ],
-- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-- ifdef([LT_AC_PROG_GCJ],
-- [define([LT_AC_PROG_GCJ],
-- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
-+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-+#
-+# Create a temporary file with TEST-FILE as its contents and pass the
-+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-+# 0 and perform ACTION-IF-FAIL for any other exit status.
-+AC_DEFUN([GLIB_RUN_PROG],
-+[cat >conftest.foo <<_ACEOF
-+$2
-+_ACEOF
-+if AC_RUN_LOG([$1 conftest.foo]); then
-+ m4_ifval([$3], [$3], [:])
-+m4_ifvaln([$4], [else $4])dnl
-+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-+fi])
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
--# _AC_PROG_LIBTOOL
--# ----------------
--AC_DEFUN([_AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+# gnome-common.m4
-+#
-
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+dnl GNOME_COMMON_INIT
-
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
-+AC_DEFUN([GNOME_COMMON_INIT],
-+[
-+ dnl this macro should come after AC_CONFIG_MACRO_DIR
-+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
-+ dnl ensure that when the Automake generated makefile calls aclocal,
-+ dnl it honours the $ACLOCAL_FLAGS environment variable
-+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-+ if test -n "$ac_macro_dir"; then
-+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-+ fi
-
-+ AC_SUBST([ACLOCAL_AMFLAGS])
-+])
-
--# AC_LIBTOOL_SETUP
--# ----------------
--AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.50)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
-+AC_DEFUN([GNOME_DEBUG_CHECK],
-+[
-+ AC_ARG_ENABLE([debug],
-+ AC_HELP_STRING([--enable-debug],
-+ [turn on debugging]),,
-+ [enable_debug=no])
-
--AC_REQUIRE([AC_PROG_LN_S])dnl
--AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--AC_REQUIRE([AC_OBJEXT])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
-+ if test x$enable_debug = xyes ; then
-+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-+ [Enable additional debugging at the expense of performance and size])
-+ fi
-+])
-+
-+dnl GNOME_MAINTAINER_MODE_DEFINES ()
-+dnl define DISABLE_DEPRECATED
- dnl
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
-+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-+[
-+ AC_REQUIRE([AM_MAINTAINER_MODE])
-
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
-+ if test $USE_MAINTAINER_MODE = yes; then
-+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
-+ else
-+ DISABLE_DEPRECATED=""
-+ fi
-+ AC_SUBST(DISABLE_DEPRECATED)
-+])
-
--case $host_os in
--aix3*)
-- # AIX sometimes has problems with the GCC collect2 program. For some
-- # reason, if we set the COLLECT_NAMES environment variable, the problems
-- # vanish in a puff of smoke.
-- if test "X${COLLECT_NAMES+set}" != Xset; then
-- COLLECT_NAMES=
-- export COLLECT_NAMES
-- fi
-- ;;
--esac
-+dnl GNOME_COMPILE_WARNINGS
-+dnl Turn on many useful compiler warnings
-+dnl For now, only works on GCC
-+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-+ dnl ******************************
-+ dnl More compiler warnings
-+ dnl ******************************
-
--# Sed substitution that helps us do robust quoting. It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
--[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+ AC_ARG_ENABLE(compile-warnings,
-+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-+ [Turn on compiler warnings]),,
-+ [enable_compile_warnings="m4_default([$1],[yes])"])
-
--# Same as above, but do not quote variable references.
--[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
-
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
-+ case "$enable_compile_warnings" in
-+ no)
-+ warning_flags=
-+ ;;
-+ minimum)
-+ warning_flags="-Wall"
-+ ;;
-+ yes)
-+ warning_flags="-Wall -Wmissing-prototypes"
-+ ;;
-+ maximum|error)
-+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-+ CFLAGS="$warning_flags $CFLAGS"
-+ for option in -Wno-sign-compare; do
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $option"
-+ AC_MSG_CHECKING([whether gcc understands $option])
-+ AC_TRY_COMPILE([], [],
-+ has_option=yes,
-+ has_option=no,)
-+ CFLAGS="$SAVE_CFLAGS"
-+ AC_MSG_RESULT($has_option)
-+ if test $has_option = yes; then
-+ warning_flags="$warning_flags $option"
-+ fi
-+ unset has_option
-+ unset SAVE_CFLAGS
-+ done
-+ unset option
-+ if test "$enable_compile_warnings" = "error" ; then
-+ warning_flags="$warning_flags -Werror"
-+ fi
-+ ;;
-+ *)
-+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-+ ;;
-+ esac
-+ CFLAGS="$realsave_CFLAGS"
-+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-+ AC_MSG_RESULT($warning_flags)
-
--# Constants:
--rm="rm -f"
-+ AC_ARG_ENABLE(iso-c,
-+ AC_HELP_STRING([--enable-iso-c],
-+ [Try to warn if code is not ISO C ]),,
-+ [enable_iso_c=no])
-+
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCFLAGS)
-+
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+ AC_SUBST(WARN_CFLAGS)
-+])
-+
-+dnl For C++, do basically the same thing.
-+
-+AC_DEFUN([GNOME_CXX_WARNINGS],[
-+ AC_ARG_ENABLE(cxx-warnings,
-+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-+ [Turn on compiler warnings.]),,
-+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
-+
-+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-+ warnCXXFLAGS=
-+ if test "x$GXX" != xyes; then
-+ enable_cxx_warnings=no
-+ fi
-+ if test "x$enable_cxx_warnings" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-+ esac
-+
-+ ## -W is not all that useful. And it cannot be controlled
-+ ## with individual -Wno-xxx flags, unlike -Wall
-+ if test "x$enable_cxx_warnings" = "xyes"; then
-+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-+ fi
-+ fi
-+ fi
-+ AC_MSG_RESULT($warnCXXFLAGS)
-+
-+ AC_ARG_ENABLE(iso-cxx,
-+ AC_HELP_STRING([--enable-iso-cxx],
-+ [Try to warn if code is not ISO C++ ]),,
-+ [enable_iso_cxx=no])
-+
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-+ complCXXFLAGS=
-+ if test "x$enable_iso_cxx" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-+ esac
-+
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCXXFLAGS)
-+
-+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+ AC_SUBST(WARN_CXXFLAGS)
-+])
-+
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-+
-+
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+ [],
-+ [m4_define([AC_PROVIDE_IFELSE],
-+ [m4_ifdef([AC_PROVIDE_$1],
-+ [$2], [$3])])])
-+
-+
-+# AC_PROG_LIBTOOL
-+# ---------------
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [AC_LIBTOOL_CXX],
-+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+ ])])
-+dnl And a similar setup for Fortran 77 support
-+ AC_PROVIDE_IFELSE([AC_PROG_F77],
-+ [AC_LIBTOOL_F77],
-+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
-+
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [ifdef([AC_PROG_GCJ],
-+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([A][M_PROG_GCJ],
-+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([LT_AC_PROG_GCJ],
-+ [define([LT_AC_PROG_GCJ],
-+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
-+
-+
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
-+
-+
-+# AC_LIBTOOL_SETUP
-+# ----------------
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
-+
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
-+
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-
- # Global variables:
- default_ofile=libtool
-@@ -8139,439 +8572,6 @@
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
-
--# Copyright (C) 1995-2002 Free Software Foundation, Inc.
--# Copyright (C) 2001-2003,2004 Red Hat, Inc.
--#
--# This file is free software, distributed under the terms of the GNU
--# General Public License. As a special exception to the GNU General
--# Public License, this file may be distributed as part of a program
--# that contains a configuration script generated by Autoconf, under
--# the same distribution terms as the rest of that program.
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--#
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
--#
--# Modified to never use included libintl.
--# Owen Taylor <otaylor at redhat.com>, 12/15/1998
--#
--# Major rework to remove unused code
--# Owen Taylor <otaylor at redhat.com>, 12/11/2002
--#
--# Added better handling of ALL_LINGUAS from GNU gettext version
--# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
--#
--# Modified to require ngettext
--# Matthias Clasen <mclasen at redhat.com> 08/06/2004
--#
--# We need this here as well, since someone might use autoconf-2.5x
--# to configure GLib then an older version to configure a package
--# using AM_GLIB_GNU_GETTEXT
--AC_PREREQ(2.53)
--
--dnl
--dnl We go to great lengths to make sure that aclocal won't
--dnl try to pull in the installed version of these macros
--dnl when running aclocal in the glib directory.
--dnl
--m4_copy([AC_DEFUN],[glib_DEFUN])
--m4_copy([AC_REQUIRE],[glib_REQUIRE])
--dnl
--dnl At the end, if we're not within glib, we'll define the public
--dnl definitions in terms of our private definitions.
--dnl
--
--# GLIB_LC_MESSAGES
--#--------------------
--glib_DEFUN([GLIB_LC_MESSAGES],
-- [AC_CHECK_HEADERS([locale.h])
-- if test $ac_cv_header_locale_h = yes; then
-- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-- if test $am_cv_val_LC_MESSAGES = yes; then
-- AC_DEFINE(HAVE_LC_MESSAGES, 1,
-- [Define if your <locale.h> file defines LC_MESSAGES.])
-- fi
-- fi])
--
--# GLIB_PATH_PROG_WITH_TEST
--#----------------------------
--dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
-- /*)
-- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in ifelse([$5], , $PATH, [$5]); do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if [$3]; then
-- ac_cv_path_$1="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
--dnl If no 4th arg is given, leave the cache variable unset,
--dnl so AC_PATH_PROGS will keep looking.
--ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--])dnl
-- ;;
--esac])dnl
--$1="$ac_cv_path_$1"
--if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-- AC_MSG_RESULT([$]$1)
--else
-- AC_MSG_RESULT(no)
--fi
--AC_SUBST($1)dnl
--])
--
--# GLIB_WITH_NLS
--#-----------------
--glib_DEFUN([GLIB_WITH_NLS],
-- dnl NLS is obligatory
-- [USE_NLS=yes
-- AC_SUBST(USE_NLS)
--
-- gt_cv_have_gettext=no
--
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
--
-- AC_CHECK_HEADER(libintl.h,
-- [gt_cv_func_dgettext_libintl="no"
-- libintl_extra_libs=""
--
-- #
-- # First check in libc
-- #
-- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-- [AC_TRY_LINK([
--#include <libintl.h>
--],
-- [return !ngettext ("","", 1)],
-- gt_cv_func_ngettext_libc=yes,
-- gt_cv_func_ngettext_libc=no)
-- ])
--
-- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-- [AC_TRY_LINK([
--#include <libintl.h>
--],
-- [return !dgettext ("","")],
-- gt_cv_func_dgettext_libc=yes,
-- gt_cv_func_dgettext_libc=no)
-- ])
-- fi
--
-- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- AC_CHECK_FUNCS(bind_textdomain_codeset)
-- fi
--
-- #
-- # If we don't have everything we want, check in libintl
-- #
-- if test "$gt_cv_func_dgettext_libc" != "yes" \
-- || test "$gt_cv_func_ngettext_libc" != "yes" \
-- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
--
-- AC_CHECK_LIB(intl, bindtextdomain,
-- [AC_CHECK_LIB(intl, ngettext,
-- [AC_CHECK_LIB(intl, dgettext,
-- gt_cv_func_dgettext_libintl=yes)])])
--
-- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- AC_MSG_CHECKING([if -liconv is needed to use gettext])
-- AC_MSG_RESULT([])
-- AC_CHECK_LIB(intl, ngettext,
-- [AC_CHECK_LIB(intl, dcgettext,
-- [gt_cv_func_dgettext_libintl=yes
-- libintl_extra_libs=-liconv],
-- :,-liconv)],
-- :,-liconv)
-- fi
--
-- #
-- # If we found libintl, then check in it for bind_textdomain_codeset();
-- # we'll prefer libc if neither have bind_textdomain_codeset(),
-- # and both have dgettext and ngettext
-- #
-- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-- glib_save_LIBS="$LIBS"
-- LIBS="$LIBS -lintl $libintl_extra_libs"
-- unset ac_cv_func_bind_textdomain_codeset
-- AC_CHECK_FUNCS(bind_textdomain_codeset)
-- LIBS="$glib_save_LIBS"
--
-- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-- gt_cv_func_dgettext_libc=no
-- else
-- if test "$gt_cv_func_dgettext_libc" = "yes" \
-- && test "$gt_cv_func_ngettext_libc" = "yes"; then
-- gt_cv_func_dgettext_libintl=no
-- fi
-- fi
-- fi
-- fi
--
-- if test "$gt_cv_func_dgettext_libc" = "yes" \
-- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-- gt_cv_have_gettext=yes
-- fi
--
-- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-- INTLLIBS="-lintl $libintl_extra_libs"
-- fi
--
-- if test "$gt_cv_have_gettext" = "yes"; then
-- AC_DEFINE(HAVE_GETTEXT,1,
-- [Define if the GNU gettext() function is already present or preinstalled.])
-- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-- if test "$MSGFMT" != "no"; then
-- glib_save_LIBS="$LIBS"
-- LIBS="$LIBS $INTLLIBS"
-- AC_CHECK_FUNCS(dcgettext)
-- MSGFMT_OPTS=
-- AC_MSG_CHECKING([if msgfmt accepts -c])
-- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
--msgid ""
--msgstr ""
--"Content-Type: text/plain; charset=UTF-8\n"
--"Project-Id-Version: test 1.0\n"
--"PO-Revision-Date: 2007-02-15 12:01+0100\n"
--"Last-Translator: test <foo at bar.xx>\n"
--"Language-Team: C <LL at li.org>\n"
--"MIME-Version: 1.0\n"
--"Content-Transfer-Encoding: 8bit\n"
--], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-- AC_SUBST(MSGFMT_OPTS)
-- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr],
-- [CATOBJEXT=.gmo
-- DATADIRNAME=share],
-- [case $host in
-- *-*-solaris*)
-- dnl On Solaris, if bind_textdomain_codeset is in libc,
-- dnl GNU format message catalog is always supported,
-- dnl since both are added to the libc all together.
-- dnl Hence, we'd like to go with DATADIRNAME=share and
-- dnl and CATOBJEXT=.gmo in this case.
-- AC_CHECK_FUNC(bind_textdomain_codeset,
-- [CATOBJEXT=.gmo
-- DATADIRNAME=share],
-- [CATOBJEXT=.mo
-- DATADIRNAME=lib])
-- ;;
-- *)
-- CATOBJEXT=.mo
-- DATADIRNAME=lib
-- ;;
-- esac])
-- LIBS="$glib_save_LIBS"
-- INSTOBJEXT=.mo
-- else
-- gt_cv_have_gettext=no
-- fi
-- fi
-- ])
--
-- if test "$gt_cv_have_gettext" = "yes" ; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [always defined to indicate that i18n is enabled])
-- fi
--
-- dnl Test whether we really found GNU xgettext.
-- if test "$XGETTEXT" != ":"; then
-- dnl If it is not GNU xgettext we define it as : so that the
-- dnl Makefiles still can work.
-- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=":"
-- fi
-- fi
--
-- # We need to process the po/ directory.
-- POSUB=po
--
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
--
-- dnl These rules are solely for the distribution goal. While doing this
-- dnl we only have to keep exactly one list of the available catalogs
-- dnl in configure.in.
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
--
-- dnl Make all variables we use known to autoconf.
-- AC_SUBST(CATALOGS)
-- AC_SUBST(CATOBJEXT)
-- AC_SUBST(DATADIRNAME)
-- AC_SUBST(GMOFILES)
-- AC_SUBST(INSTOBJEXT)
-- AC_SUBST(INTLLIBS)
-- AC_SUBST(PO_IN_DATADIR_TRUE)
-- AC_SUBST(PO_IN_DATADIR_FALSE)
-- AC_SUBST(POFILES)
-- AC_SUBST(POSUB)
-- ])
--
--# AM_GLIB_GNU_GETTEXT
--# -------------------
--# Do checks necessary for use of gettext. If a suitable implementation
--# of gettext is found in either in libintl or in the C library,
--# it will set INTLLIBS to the libraries needed for use of gettext
--# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
--# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
--# on various variables needed by the Makefile.in.in installed by
--# glib-gettextize.
--dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-- [AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_HEADER_STDC])dnl
--
-- GLIB_LC_MESSAGES
-- GLIB_WITH_NLS
--
-- if test "$gt_cv_have_gettext" = "yes"; then
-- if test "x$ALL_LINGUAS" = "x"; then
-- LINGUAS=
-- else
-- AC_MSG_CHECKING(for catalogs to be installed)
-- NEW_LINGUAS=
-- for presentlang in $ALL_LINGUAS; do
-- useit=no
-- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-- desiredlanguages="$LINGUAS"
-- else
-- desiredlanguages="$ALL_LINGUAS"
-- fi
-- for desiredlang in $desiredlanguages; do
-- # Use the presentlang catalog if desiredlang is
-- # a. equal to presentlang, or
-- # b. a variant of presentlang (because in this case,
-- # presentlang can be used as a fallback for messages
-- # which are not translated in the desiredlang catalog).
-- case "$desiredlang" in
-- "$presentlang"*) useit=yes;;
-- esac
-- done
-- if test $useit = yes; then
-- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-- fi
-- done
-- LINGUAS=$NEW_LINGUAS
-- AC_MSG_RESULT($LINGUAS)
-- fi
--
-- dnl Construct list of names of catalog files to be constructed.
-- if test -n "$LINGUAS"; then
-- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-- fi
-- fi
--
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- fi
-- AC_SUBST(MKINSTALLDIRS)
--
-- dnl Generate list of files to be processed by xgettext which will
-- dnl be included in po/Makefile.
-- test -d po || mkdir po
-- if test "x$srcdir" != "x."; then
-- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-- posrcprefix="$srcdir/"
-- else
-- posrcprefix="../$srcdir/"
-- fi
-- else
-- posrcprefix="../"
-- fi
-- rm -f po/POTFILES
-- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
--
--# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
--# -------------------------------
--# Define VARIABLE to the location where catalog files will
--# be installed by po/Makefile.
--glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
--[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
--glib_save_prefix="$prefix"
--glib_save_exec_prefix="$exec_prefix"
--glib_save_datarootdir="$datarootdir"
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--datarootdir=`eval echo "${datarootdir}"`
--if test "x$CATOBJEXT" = "x.mo" ; then
-- localedir=`eval echo "${libdir}/locale"`
--else
-- localedir=`eval echo "${datadir}/locale"`
--fi
--prefix="$glib_save_prefix"
--exec_prefix="$glib_save_exec_prefix"
--datarootdir="$glib_save_datarootdir"
--AC_DEFINE_UNQUOTED($1, "$localedir",
-- [Define the location where the catalogs will be installed])
--])
--
--dnl
--dnl Now the definitions that aclocal will find
--dnl
--ifdef(glib_configure_in,[],[
--AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
--AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
--])dnl
--
--# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
--#
--# Create a temporary file with TEST-FILE as its contents and pass the
--# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
--# 0 and perform ACTION-IF-FAIL for any other exit status.
--AC_DEFUN([GLIB_RUN_PROG],
--[cat >conftest.foo <<_ACEOF
--$2
--_ACEOF
--if AC_RUN_LOG([$1 conftest.foo]); then
-- m4_ifval([$3], [$3], [:])
--m4_ifvaln([$4], [else $4])dnl
--echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
--sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
--fi])
--
--
- m4_include([m4/gecko.m4])
- m4_include([m4/gnome-doc-utils.m4])
- m4_include([m4/gtk-doc.m4])
-Index: epiphany-2.22.3/configure
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+Index: epiphany-2.24.1/configure
===================================================================
---- epiphany-2.22.3.orig/configure 2008-06-30 19:02:21.000000000 +0100
-+++ epiphany-2.22.3/configure 2008-09-14 15:54:18.000000000 +0100
-@@ -727,7 +727,7 @@
+--- epiphany-2.24.1.orig/configure 2008-10-19 14:53:41.000000000 +0200
++++ epiphany-2.24.1/configure 2008-11-14 00:40:10.174985090 +0100
+@@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.22.3'
- PACKAGE_STRING='GNOME Web Browser 2.22.3'
+ PACKAGE_VERSION='2.24.1'
+ PACKAGE_STRING='GNOME Web Browser 2.24.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -1638,7 +1638,7 @@
+@@ -1638,7 +1638,7 @@ Fine tuning of the installation director
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -1493,118 +37,20 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2681,7 +2681,7 @@
+@@ -2684,7 +2684,7 @@ fi
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.22.3'
+ VERSION='2.24.1'
-@@ -23413,6 +23413,7 @@
- LIBXML_REQUIRED=2.6.12
- LIBXSLT_REQUIRED=1.1.7
- LIBGLADE_REQUIRED=2.3.1
-+LIBGNOMEVFS_REQUIRED=2.9.2
- LIBGNOME_REQUIRED=2.14.0
- LIBGNOMEUI_REQUIRED=2.14.0
- GNOME_DESKTOP_REQUIRED=2.9.91
-@@ -23462,6 +23463,8 @@
- libgnome-2.0 >= \$LIBGNOME_REQUIRED
- libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED
- libglade-2.0 >= \$LIBGLADE_REQUIRED \\
-+ gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23478,6 +23481,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23497,6 +23502,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23525,6 +23532,8 @@
- libgnome-2.0 >= \$LIBGNOME_REQUIRED
- libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED
- libglade-2.0 >= \$LIBGLADE_REQUIRED \\
-+ gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23541,6 +23550,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23560,6 +23571,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23594,6 +23607,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23611,6 +23626,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23631,6 +23648,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-@@ -23657,6 +23676,8 @@
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED \
-+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
-+ gnome-vfs-module-2.0
- gconf-2.0
- gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
-Index: epiphany-2.22.3/embed/mozilla/Makefile.in
+Index: epiphany-2.24.1/embed/mozilla/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/embed/mozilla/Makefile.in 2008-06-30 19:02:25.000000000 +0100
-+++ epiphany-2.22.3/embed/mozilla/Makefile.in 2008-09-14 15:54:12.000000000 +0100
-@@ -515,7 +515,7 @@
+--- epiphany-2.24.1.orig/embed/mozilla/Makefile.in 2008-10-19 14:53:36.000000000 +0200
++++ epiphany-2.24.1/embed/mozilla/Makefile.in 2008-11-14 00:40:07.194984978 +0100
+@@ -515,7 +515,7 @@ libephymozillaembed_la_CPPFLAGS = -I$(to
-I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \
-I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -1613,11 +59,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.22.3/lib/Makefile.in
+Index: epiphany-2.24.1/lib/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/lib/Makefile.in 2008-06-30 19:02:26.000000000 +0100
-+++ epiphany-2.22.3/lib/Makefile.in 2008-09-14 15:54:13.000000000 +0100
-@@ -435,7 +435,7 @@
+--- epiphany-2.24.1.orig/lib/Makefile.in 2008-10-19 14:53:37.000000000 +0200
++++ epiphany-2.24.1/lib/Makefile.in 2008-11-14 00:40:07.718984954 +0100
+@@ -435,7 +435,7 @@ libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -1626,11 +72,11 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-2.22.3/ltmain.sh
+Index: epiphany-2.24.1/ltmain.sh
===================================================================
---- epiphany-2.22.3.orig/ltmain.sh 2008-02-08 00:54:46.000000000 +0000
-+++ epiphany-2.22.3/ltmain.sh 2008-04-29 22:33:55.000000000 +0100
-@@ -43,7 +43,7 @@
+--- epiphany-2.24.1.orig/ltmain.sh 2008-02-08 01:54:46.000000000 +0100
++++ epiphany-2.24.1/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
+@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -1639,11 +85,11 @@
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-Index: epiphany-2.22.3/plugins/desktop-file/Makefile.in
+Index: epiphany-2.24.1/plugins/desktop-file/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.in 2008-06-30 19:02:27.000000000 +0100
-+++ epiphany-2.22.3/plugins/desktop-file/Makefile.in 2008-09-14 15:54:15.000000000 +0100
-@@ -315,7 +315,7 @@
+--- epiphany-2.24.1.orig/plugins/desktop-file/Makefile.in 2008-10-19 14:53:38.000000000 +0200
++++ epiphany-2.24.1/plugins/desktop-file/Makefile.in 2008-11-14 00:40:08.242984933 +0100
+@@ -315,7 +315,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_engine = @with_engine@
@@ -1652,11 +98,11 @@
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
plugin.cpp
-Index: epiphany-2.22.3/src/Makefile.in
+Index: epiphany-2.24.1/src/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/src/Makefile.in 2008-06-30 19:02:28.000000000 +0100
-+++ epiphany-2.22.3/src/Makefile.in 2008-09-14 15:54:15.000000000 +0100
-@@ -554,8 +554,8 @@
+--- epiphany-2.24.1.orig/src/Makefile.in 2008-10-19 14:53:38.000000000 +0200
++++ epiphany-2.24.1/src/Makefile.in 2008-11-14 00:40:08.618985025 +0100
+@@ -554,8 +554,8 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -1667,7 +113,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -593,8 +593,8 @@
+@@ -593,8 +593,8 @@ libephymain_la_CFLAGS = \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
@ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
Added: desktop/experimental/epiphany-browser/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/99_ltmain_as-needed.patch?rev=17537&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/99_ltmain_as-needed.patch Fri Nov 14 00:43:00 2008
@@ -1,0 +1,32 @@
+Index: bug-buddy-2.24.1/ltmain.sh
+===================================================================
+--- bug-buddy-2.24.1.orig/ltmain.sh 2008-11-13 16:38:58.930987388 +0100
++++ bug-buddy-2.24.1/ltmain.sh 2008-11-13 16:39:01.278988042 +0100
+@@ -1807,6 +1807,11 @@ EOF
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2150,6 +2155,15 @@ EOF
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series Fri Nov 14 00:43:00 2008
@@ -9,16 +9,10 @@
#08_load_on_new_tab.patch
08_python_path.patch
09_download_dialog.patch
-10_url_double-click.patch
11_useragent-weasel.patch
12_safetypes.patch
13_extensions_need_xpcom.patch
-14_zoom-crash.patch
-15_certificates_oldapi.patch
-16_fix-notify-uninit-crash.patch
-17_print-scaling.patch
-18_gnome-vfs-for-helper-display.patch
-19_passwords_crash.patch
20_print_garbage.patch
21_chrome_certmanager.patch
99_autoreconf.patch
+99_ltmain_as-needed.patch
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=17537&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Fri Nov 14 00:43:00 2008
@@ -18,11 +18,14 @@
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
+
FLAVORS := gecko webkit
QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
common_configure_flags := \
+ --disable-maintainer-mode \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--sysconfdir=/etc \
More information about the pkg-gnome-commits
mailing list