reverted: --- gnome-system-tools-2.22.0/debian/patches/83_network-locations-apply-button.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/83_network-locations-apply-button.dpatch @@ -1,207 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 83_network-locations-apply-button.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.21.2.1~/interfaces/network.ui gnome-system-tools-2.21.2.1/interfaces/network.ui ---- gnome-system-tools-2.21.2.1~/interfaces/network.ui 2007-09-26 23:29:16.000000000 +0200 -+++ gnome-system-tools-2.21.2.1/interfaces/network.ui 2007-12-12 18:52:02.000000000 +0100 -@@ -186,6 +186,31 @@ - False - - -+ -+ -+ True -+ Apply location as the current configuration -+ True -+ GTK_RELIEF_NORMAL -+ True -+ -+ -+ True -+ 4 -+ gtk-apply -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ -+ -+ -+ -+ 0 -+ False -+ False -+ -+ - - - 0 -diff -urNad gnome-system-tools-2.21.2.1~/src/network/locations-combo.c gnome-system-tools-2.21.2.1/src/network/locations-combo.c ---- gnome-system-tools-2.21.2.1~/src/network/locations-combo.c 2007-09-26 23:29:17.000000000 +0200 -+++ gnome-system-tools-2.21.2.1/src/network/locations-combo.c 2007-12-12 18:51:45.000000000 +0100 -@@ -34,6 +34,7 @@ - GtkWidget *combo; - GtkWidget *save_button; - GtkWidget *delete_button; -+ GtkWidget *apply_button; - - GtkWidget *save_dialog; - GtkWidget *location_entry; -@@ -44,7 +45,8 @@ - PROP_TOOL, - PROP_COMBO, - PROP_SAVE, -- PROP_DELETE -+ PROP_DELETE, -+ PROP_APPLY - }; - - static void gst_locations_combo_class_init (GstLocationsComboClass *class); -@@ -108,6 +110,13 @@ - "Delete", - GTK_TYPE_BUTTON, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -+ g_object_class_install_property (object_class, -+ PROP_APPLY, -+ g_param_spec_object ("apply", -+ "Apply", -+ "Apply", -+ GTK_TYPE_BUTTON, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_type_class_add_private (object_class, - sizeof (GstLocationsComboPrivate)); - } -@@ -137,6 +146,9 @@ - if (priv->delete_button) - g_object_unref (priv->delete_button); - -+ if (priv->apply_button) -+ g_object_unref (priv->apply_button); -+ - if (priv->model) - g_object_unref (priv->model); - } -@@ -166,6 +178,9 @@ - case PROP_DELETE: - priv->delete_button = GTK_WIDGET (g_value_dup_object (value)); - break; -+ case PROP_APPLY: -+ priv->apply_button = GTK_WIDGET (g_value_dup_object (value)); -+ break; - } - } - -@@ -194,6 +209,9 @@ - case PROP_DELETE: - g_value_set_object (value, priv->delete_button); - break; -+ case PROP_APPLY: -+ g_value_set_object (value, priv->apply_button); -+ break; - } - } - -@@ -215,11 +233,9 @@ - gtk_tree_model_get (model, &iter, 0, &str, -1); - gst_network_locations_set_location (locations, str); - gst_tool_update_gui (priv->tool); -- -- oobs_object_commit (locations->hosts_config); -- gst_tool_commit_async (priv->tool, locations->ifaces_config, -- _("Changing network location"), NULL, NULL); - g_free (str); -+ -+ gtk_widget_set_sensitive (priv->apply_button, TRUE); - } - } - -@@ -430,6 +446,22 @@ - } - - static void -+on_apply_button_clicked (GtkWidget *widget, gpointer data) -+{ -+ GstNetworkLocations *locations; -+ GstLocationsComboPrivate *priv; -+ -+ priv = GST_LOCATIONS_COMBO (data)->_priv; -+ locations = GST_NETWORK_LOCATIONS (data); -+ -+ oobs_object_commit (locations->hosts_config); -+ gst_tool_commit_async (priv->tool, locations->ifaces_config, -+ _("Changing network location"), NULL, NULL); -+ -+ gtk_widget_set_sensitive (widget, FALSE); -+} -+ -+static void - fill_model (GstLocationsCombo *combo, - GtkTreeModel *model) - { -@@ -480,6 +512,11 @@ - G_CALLBACK (on_save_button_clicked), object); - g_signal_connect (G_OBJECT (priv->delete_button), "clicked", - G_CALLBACK (on_delete_button_clicked), object); -+ g_signal_connect (G_OBJECT (priv->apply_button), "clicked", -+ G_CALLBACK (on_apply_button_clicked), object); -+ -+ /* set the apply button initially unsensitive */ -+ gtk_widget_set_sensitive (priv->apply_button, FALSE); - - return object; - } -@@ -501,12 +538,14 @@ - gst_locations_combo_new (GstTool *tool, - GtkWidget *combo, - GtkWidget *save, -- GtkWidget *delete) -+ GtkWidget *delete, -+ GtkWidget *apply) - { - return g_object_new (GST_TYPE_LOCATIONS_COMBO, - "tool", tool, - "combo", combo, - "save", save, - "delete", delete, -+ "apply", apply, - NULL); - } -diff -urNad gnome-system-tools-2.21.2.1~/src/network/locations-combo.h gnome-system-tools-2.21.2.1/src/network/locations-combo.h ---- gnome-system-tools-2.21.2.1~/src/network/locations-combo.h 2007-09-26 23:29:17.000000000 +0200 -+++ gnome-system-tools-2.21.2.1/src/network/locations-combo.h 2007-12-12 18:51:45.000000000 +0100 -@@ -53,7 +53,8 @@ - GstLocationsCombo* gst_locations_combo_new (GstTool *tool, - GtkWidget *combo, - GtkWidget *add, -- GtkWidget *remove); -+ GtkWidget *remove, -+ GtkWidget *apply); - - - G_END_DECLS -diff -urNad gnome-system-tools-2.21.2.1~/src/network/network-tool.c gnome-system-tools-2.21.2.1/src/network/network-tool.c ---- gnome-system-tools-2.21.2.1~/src/network/network-tool.c 2007-09-30 18:07:57.000000000 +0200 -+++ gnome-system-tools-2.21.2.1/src/network/network-tool.c 2007-12-12 18:51:45.000000000 +0100 -@@ -109,7 +109,7 @@ - { - GObject *object; - GstNetworkTool *tool; -- GtkWidget *widget, *add_button, *delete_button; -+ GtkWidget *widget, *add_button, *delete_button, *apply_button; - - object = (* G_OBJECT_CLASS (gst_network_tool_parent_class)->constructor) (type, - n_construct_properties, -@@ -147,7 +147,8 @@ - widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "locations_combo"); - add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "add_location"); - delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "remove_location"); -- tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button); -+ apply_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "apply_location"); -+ tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button, apply_button); - - tool->dialog = connection_dialog_init (GST_TOOL (tool)); - reverted: --- gnome-system-tools-2.22.0/debian/patches/18_disable_uid.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/18_disable_uid.dpatch @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 18_disable_uid.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.15.3~/src/users/user-settings.c gnome-system-tools-2.15.3/src/users/user-settings.c ---- gnome-system-tools-2.15.3~/src/users/user-settings.c 2006-08-28 03:58:40.000000000 +0200 -+++ gnome-system-tools-2.15.3/src/users/user-settings.c 2006-09-06 12:32:35.000000000 +0200 -@@ -324,6 +324,7 @@ - uid = find_new_uid (GST_USERS_TOOL (tool)->minimum_uid, - GST_USERS_TOOL (tool)->maximum_uid); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), uid); -+ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), TRUE); - setup_profiles_visibility (tool, TRUE); - } else { - g_object_set_data (G_OBJECT (dialog), "is_new", GINT_TO_POINTER (FALSE)); -@@ -340,6 +341,7 @@ - - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user)); -+ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE); - setup_profiles_visibility (tool, FALSE); - } - reverted: --- gnome-system-tools-2.22.0/debian/patches/80_gst-packages-common.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/80_gst-packages-common.dpatch @@ -1,281 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 80_gst-packages-common.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.15.3~/src/common/Makefile.am gnome-system-tools-2.15.3/src/common/Makefile.am ---- gnome-system-tools-2.15.3~/src/common/Makefile.am 2006-09-04 20:17:10.000000000 +0200 -+++ gnome-system-tools-2.15.3/src/common/Makefile.am 2006-09-06 12:41:04.000000000 +0200 -@@ -9,5 +9,6 @@ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" - - libsetuptool_a_SOURCES = \ -+ gst-package.c gst-package.h \ - gst-dialog.c gst-dialog.h \ - gst-tool.c gst-tool.h \ -diff -urNad gnome-system-tools-2.15.3~/src/common/gst-package.c gnome-system-tools-2.15.3/src/common/gst-package.c ---- gnome-system-tools-2.15.3~/src/common/gst-package.c 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-system-tools-2.15.3/src/common/gst-package.c 2006-09-06 12:41:04.000000000 +0200 -@@ -0,0 +1,211 @@ -+/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ -+/* -+ * Copyright (C) 2004 Vincent Untz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * Authors: Vincent Untz -+ * Guillaume Desmottes -+ * Carlos Garnacho -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "gst-package.h" -+ -+static void -+show_error_dialog (GtkWindow *window, -+ const gchar *secondary_text) -+{ -+ GtkWidget *dialog; -+ -+ dialog = gtk_message_dialog_new (window, -+ GTK_DIALOG_MODAL, -+ GTK_MESSAGE_ERROR, -+ GTK_BUTTONS_CLOSE, -+ _("Could not install package")); -+ -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text); -+ gtk_dialog_run (GTK_DIALOG (dialog)); -+ gtk_widget_destroy (dialog); -+} -+ -+static gboolean -+find_app (GtkWindow *window, -+ const gchar *app) -+{ -+ gchar *path; -+ -+ path = g_find_program_in_path (app); -+ -+ if (!path) -+ { -+ show_error_dialog (window, -+ _("The necessary applications to install" -+ " the package could not be found.")); -+ return FALSE; -+ } -+ -+ g_free (path); -+ -+ return TRUE; -+} -+ -+static gchar * -+create_temp_file (const gchar *packages[]) -+{ -+ int fd; -+ gchar *path, *str; -+ -+ path = g_strdup_printf ("/tmp/packages.XXXXXX"); -+ fd = mkstemp (path); -+ -+ while (*packages) -+ { -+ str = g_strdup_printf ("%s\ti\n", *packages); -+ write (fd, str, strlen (str)); -+ g_free (str); -+ packages++; -+ } -+ -+ close (fd); -+ return path; -+} -+ -+static gchar* -+get_synaptic_command_line (GtkWindow *window, -+ const gchar *path) -+{ -+ gchar *synaptic_path, *command; -+ -+ synaptic_path = g_find_program_in_path ("synaptic"); -+ command = g_strdup_printf ("%s --hide-main-window --non-interactive " -+ "--set-selections-file %s --parent-window-id %d", -+ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window)); -+ g_free (synaptic_path); -+ return command; -+} -+ -+static gboolean -+spawn_synaptic (GtkWindow *window, -+ const gchar *path, -+ gint *child_pid) -+{ -+ gchar **argv; -+ GError *error = NULL; -+ gboolean retval = TRUE; -+ gint i = 0; -+ -+ argv = g_new0 (gchar*, 6); -+ argv[i++] = g_find_program_in_path ("gksudo"); -+ argv[i++] = g_strdup ("--desktop"); -+ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); -+ argv[i++] = g_strdup ("--disable-grab"); -+ argv[i++] = get_synaptic_command_line (window, path); -+ argv[i++] = NULL; -+ -+ if (!gdk_spawn_on_screen (gtk_window_get_screen (window), -+ NULL, argv, NULL, -+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, -+ NULL, NULL, child_pid, &error)) -+ { -+ show_error_dialog (window, (error) ? error->message : ""); -+ g_error_free (error); -+ retval = FALSE; -+ } -+ -+ g_strfreev (argv); -+ -+ return retval; -+} -+ -+gboolean -+on_wait_timeout (gpointer data) -+{ -+ gint pid, status; -+ -+ pid = GPOINTER_TO_INT (data); -+ -+ if (waitpid (pid, &status, WNOHANG) > 0) -+ { -+ /* FIXME: should show an error dialog if the installation fails, -+ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */ -+ gtk_main_quit (); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ -+static gboolean -+wait_for_synaptic (GtkWindow *window, gint pid) -+{ -+ GdkCursor *cursor; -+ gint timer; -+ -+ cursor = gdk_cursor_new (GDK_WATCH); -+ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); -+ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); -+ -+ /* wait here a bit until the process has exited */ -+ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); -+ gtk_main (); -+ -+ g_source_remove (timer); -+ gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE); -+ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); -+ -+ gdk_cursor_unref (cursor); -+ -+ /* keep this until we can get status -+ * info from the launched process */ -+ return TRUE; -+} -+ -+gboolean -+gst_packages_install (GtkWindow *window, -+ const gchar *packages[]) -+{ -+ gchar *path; -+ pid_t pid; -+ gboolean retval = FALSE; -+ -+ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); -+ -+ if (!find_app (window, "synaptic") || !find_app (window, "gksudo")) -+ return FALSE; -+ -+ path = create_temp_file (packages); -+ -+ if (spawn_synaptic (window, path, &pid)) -+ retval = wait_for_synaptic (window, pid); -+ -+ unlink (path); -+ g_free (path); -+ -+ return retval; -+} -diff -urNad gnome-system-tools-2.15.3~/src/common/gst-package.h gnome-system-tools-2.15.3/src/common/gst-package.h ---- gnome-system-tools-2.15.3~/src/common/gst-package.h 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-system-tools-2.15.3/src/common/gst-package.h 2006-09-06 12:41:04.000000000 +0200 -@@ -0,0 +1,35 @@ -+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */ -+/* -+ * Copyright (C) 2004 Vincent Untz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * Authors: Carlos Garnacho Parro -+ * Authors: Vincent Untz -+ * Authors: Guillaume Desmottes -+ */ -+ -+#ifndef __GST_PACKAGES_H__ -+#define __GST_PACKAGES_H__ -+ -+#include -+ -+G_BEGIN_DECLS -+ -+gboolean gst_packages_install (GtkWindow *window, const char **packages); -+ -+G_END_DECLS -+ -+#endif /* __GST_PACKAGES_H__ */ -diff -urNad gnome-system-tools-2.15.3~/src/common/gst.h gnome-system-tools-2.15.3/src/common/gst.h ---- gnome-system-tools-2.15.3~/src/common/gst.h 2006-09-03 11:40:20.000000000 +0200 -+++ gnome-system-tools-2.15.3/src/common/gst.h 2006-09-06 12:41:04.000000000 +0200 -@@ -1,5 +1,6 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - #include -+#include "gst-package.h" - #include "gst-tool.h" - #include "gst-dialog.h" - #include "gst-conf.h" reverted: --- gnome-system-tools-2.22.0/debian/patches/98_automake.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/98_automake.dpatch @@ -1,3501 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 98_automake.dpatch by Emilio Pozuelo Monfort -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.21.92~/Makefile.in gnome-system-tools-2.21.92/Makefile.in ---- gnome-system-tools-2.21.92~/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -39,8 +39,7 @@ - AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -diff -urNad gnome-system-tools-2.21.92~/aclocal.m4 gnome-system-tools-2.21.92/aclocal.m4 ---- gnome-system-tools-2.21.92~/aclocal.m4 2008-02-26 00:35:00.000000000 +0100 -+++ gnome-system-tools-2.21.92/aclocal.m4 2008-02-27 16:44:15.000000000 +0100 -@@ -19,956 +19,739 @@ - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl - --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --# (This private macro should not be called outside this file.) --AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.10' --dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to --dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10.1], [], -- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl --]) -+AC_DEFUN([AM_GCONF_SOURCE_2], -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi - --# _AM_AUTOCONF_VERSION(VERSION) --# ----------------------------- --# aclocal traces this macro to find the Autoconf version. --# This is a private macro too. Using m4_define simplifies --# the logic in aclocal, which can simply ignore this definition. --m4_define([_AM_AUTOCONF_VERSION], []) -+ AC_ARG_WITH(gconf-source, -+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10.1])dnl --m4_ifndef([AC_AUTOCONF_VERSION], -- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - --# AM_AUX_DIR_EXPAND -*- Autoconf -*- -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ fi - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ AC_ARG_WITH(gconf-schema-file-dir, -+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) - --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. --# --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ -+ AC_ARG_ENABLE(schemas-install, -+ [ --disable-schemas-install Disable the schemas installation], -+ [case ${enableval} in -+ yes|no) ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; -+ esac]) -+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -+]) -+ -+# Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003,2004 Red Hat, Inc. - # --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir -+# 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. - # --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. -+# 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. - # --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995, 1996 - # --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -- --AC_DEFUN([AM_AUX_DIR_EXPAND], --[dnl Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50])dnl --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` --]) -- -- --# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 --# Free Software Foundation, Inc. -+# Modified to never use included libintl. -+# Owen Taylor , 12/15/1998 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 4 -- --# This was merged into AC_PROG_CC in Autoconf. -- --AU_DEFUN([AM_PROG_CC_STDC], --[AC_PROG_CC --AC_DIAGNOSE([obsolete], [$0: -- your code should no longer depend upon `am_cv_prog_cc_stdc', but upon -- `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when -- you adjust the code. You can also remove the above call to -- AC_PROG_CC if you already called it elsewhere.]) --am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc --]) --AU_DEFUN([fp_PROG_CC_STDC]) -- --# AM_CONDITIONAL -*- Autoconf -*- -- --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 --# Free Software Foundation, Inc. -+# Major rework to remove unused code -+# Owen Taylor , 12/11/2002 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 8 -- --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- --# Define a conditional. --AC_DEFUN([AM_CONDITIONAL], --[AC_PREREQ(2.52)dnl -- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE])dnl --AC_SUBST([$1_FALSE])dnl --_AM_SUBST_NOTMAKE([$1_TRUE])dnl --_AM_SUBST_NOTMAKE([$1_FALSE])dnl --if $2; then -- $1_TRUE= -- $1_FALSE='#' --else -- $1_TRUE='#' -- $1_FALSE= --fi --AC_CONFIG_COMMANDS_PRE( --[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([[conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]]) --fi])]) -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 --# Free Software Foundation, Inc. -+# Added better handling of ALL_LINGUAS from GNU gettext version -+# written by Bruno Haible, Owen Taylor 5/30/3002 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 9 -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -- --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. -+# Modified to require ngettext -+# Matthias Clasen 08/06/2004 - # --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -- --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], UPC, [depcc="$UPC" am_compiler_list=], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+# 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) - --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -+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 - -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+# 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 ], [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 file defines LC_MESSAGES.]) -+ fi -+ fi]) - -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -+# 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 -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi - fi - done -- -- cd .. -- rm -rf conftest.dir -+ 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 -- am_cv_$1_dependencies_compiler_type=none --fi --]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -- -- --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) -- -- --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' -+ AC_MSG_RESULT(no) - fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH])dnl --_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+AC_SUBST($1)dnl - ]) - --# Generate code to set up dependency tracking. -*- Autoconf -*- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --#serial 3 -- --# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # Grep'ing the whole file is not good either: AIX grep has a line -- # limit of 2048, but all sed's we know have understand at least 4000. -- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -- fi -- # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -- test -z "$DEPDIR" && continue -- am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` -- # Find all dependency output files, they are included files with -- # $(DEPDIR) in their names. We invoke sed twice because it is the -- # simplest approach to changing $(DEPDIR) to its actual value in the -- # expansion. -- for file in `sed -n " -- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --])# _AM_OUTPUT_DEPENDENCY_COMMANDS -- -+# GLIB_WITH_NLS -+#----------------- -+glib_DEFUN([GLIB_WITH_NLS], -+ dnl NLS is obligatory -+ [USE_NLS=yes -+ AC_SUBST(USE_NLS) - --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) --]) -+ gt_cv_have_gettext=no - --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= - --# serial 8 -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" - --# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. --AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -+ # -+ # First check in libc -+ # -+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [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 -+], -+ [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 - --# Do all the work for Automake. -*- Autoconf -*- -+ # -+ # 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)])]) - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2008 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ 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 - --# serial 13 -+ # -+ # 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" - --# This macro actually does too much. Some checks are only needed if --# your package does certain things. But this isn't really a big deal. -+ 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 - --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.60])dnl --dnl Autoconf wants to disallow AM_ names. We explicitly allow --dnl the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl --AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl --AC_REQUIRE([AC_PROG_INSTALL])dnl --if test "`cd $srcdir && pwd`" != "`pwd`"; then -- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -- # is not polluted with repeated "-I." -- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -- # test to see if srcdir already configured -- if test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -- 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 \n" -+"Language-Team: C \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 -+ ]) - --# test whether we have cygpath --if test -z "$CYGPATH_W"; then -- if (cygpath --version) >/dev/null 2>/dev/null; then -- CYGPATH_W='cygpath -w' -- else -- CYGPATH_W=echo -- fi --fi --AC_SUBST([CYGPATH_W]) -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [always defined to indicate that i18n is enabled]) -+ fi - --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl --dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. --m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ 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 - --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ # We need to process the po/ directory. -+ POSUB=po - --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --AC_REQUIRE([AM_PROG_MKDIR_P])dnl --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_SET_LEADING_DOT])dnl --_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -- [_AM_PROG_TAR([v7])])]) --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_OBJC], -- [_AM_DEPENDENCIES(OBJC)], -- [define([AC_PROG_OBJC], -- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl --]) --]) -+ 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 - --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. The stamp files are numbered to have different names. -+ 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) -+ ]) - --# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the --# loop where config.status creates the headers, so we can generate --# our stamp files there. --AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], --[# Compute $1's index in $config_headers. --_am_arg=$1 --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in -- $_am_arg | $_am_arg:* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac --done --echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -+# 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 - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ 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 - --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -+ 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 - --# Copyright (C) 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ 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) - --# serial 2 -+ 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 -+ ]) - --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. -+# 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 -- am__leading_dot=_ -+ localedir=`eval echo "${datadir}/locale"` - fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -- --# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- --# From Jim Meyering -+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]) -+]) - --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+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 - --# serial 4 -+# 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]) - --AC_DEFUN([AM_MAINTAINER_MODE], --[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -- dnl maintainer-mode is disabled by default -- AC_ARG_ENABLE(maintainer-mode, --[ --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer], -- USE_MAINTAINER_MODE=$enableval, -- USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -- MAINT=$MAINTAINER_MODE_TRUE -- AC_SUBST(MAINT)dnl --] --) - --AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -+AC_DEFUN([GNOME_DOC_DEFINES], -+[ -+AC_ARG_WITH([help-dir], -+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, -+ [with_help_dir='${datadir}/gnome/help']) -+HELP_DIR="$with_help_dir" -+AC_SUBST(HELP_DIR) - --# Check to see how 'make' treats includes. -*- Autoconf -*- -+AC_ARG_WITH([omf-dir], -+ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, -+ [with_omf_dir='${datadir}/omf']) -+OMF_DIR="$with_omf_dir" -+AC_SUBST(OMF_DIR) - --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+AC_ARG_WITH([help-formats], -+ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, -+ [with_help_formats='']) -+DOC_USER_FORMATS="$with_help_formats" -+AC_SUBST(DOC_USER_FORMATS) - --# serial 3 -+AC_ARG_ENABLE([scrollkeeper], -+ [AC_HELP_STRING([--disable-scrollkeeper], -+ [do not make updates to the scrollkeeper database])],, -+ enable_scrollkeeper=yes) -+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --am__doit: -- @echo done --.PHONY: am__doit --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include="#" --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote="\"" -- _am_result=BSD -- fi --fi --AC_SUBST([am__include]) --AC_SUBST([am__quote]) --AC_MSG_RESULT([$_am_result]) --rm -f confinc confmf -+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) - ]) - --# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -- --# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 --# Free Software Foundation, Inc. -+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 5 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -+AC_DEFUN([GNOME_DOC_INIT], -+[ -+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - -+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], -+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --AC_REQUIRE_AUX_FILE([missing])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " -+if test "$gdu_cv_have_gdu" = "yes"; then -+ ifelse([$2],,[:],[$2]) - else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) -+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) - fi --]) - --# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_MKDIR_P --# --------------- --# Check for `mkdir -p'. --AC_DEFUN([AM_PROG_MKDIR_P], --[AC_PREREQ([2.60])dnl --AC_REQUIRE([AC_PROG_MKDIR_P])dnl --dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, --dnl while keeping a definition of mkdir_p for backward compatibility. --dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. --dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of --dnl Makefile.ins that do not define MKDIR_P, so we do our own --dnl adjustment using top_builddir (which is defined more often than --dnl MKDIR_P). --AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl --case $mkdir_p in -- [[\\/$]]* | ?:[[\\/]]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac -+GNOME_DOC_DEFINES - ]) - --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 3 - --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -- --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -- --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -+# serial 36 IT_PROG_INTLTOOL -+AC_DEFUN([IT_PROG_INTLTOOL], -+[AC_PREREQ([2.50])dnl - --# Check to make sure that the build environment is sane. -*- Autoconf -*- -+case "$am__api_version" in -+ 1.[01234]) -+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) -+ ;; -+ *) -+ ;; -+esac - --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+if test -n "$1"; then -+ AC_MSG_CHECKING([for intltool >= $1]) - --# serial 4 -+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` -+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` -+ ] -+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -+fi - --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' -+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -+AC_SUBST(INTLTOOL_DESKTOP_RULE) -+AC_SUBST(INTLTOOL_DIRECTORY_RULE) -+AC_SUBST(INTLTOOL_KEYS_RULE) -+AC_SUBST(INTLTOOL_PROP_RULE) -+AC_SUBST(INTLTOOL_OAF_RULE) -+AC_SUBST(INTLTOOL_PONG_RULE) -+AC_SUBST(INTLTOOL_SERVER_RULE) -+AC_SUBST(INTLTOOL_SHEET_RULE) -+AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -+AC_SUBST(INTLTOOL_UI_RULE) -+AC_SUBST(INTLTOOL_XAM_RULE) -+AC_SUBST(INTLTOOL_KBD_RULE) -+AC_SUBST(INTLTOOL_XML_RULE) -+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -+AC_SUBST(INTLTOOL_CAVES_RULE) -+AC_SUBST(INTLTOOL_SCHEMAS_RULE) -+AC_SUBST(INTLTOOL_THEME_RULE) -+AC_SUBST(INTLTOOL_SERVICE_RULE) -+AC_SUBST(INTLTOOL_POLICY_RULE) - -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) -+# Check the gettext tools to make sure they are GNU -+AC_PATH_PROG(XGETTEXT, xgettext) -+AC_PATH_PROG(MSGMERGE, msgmerge) -+AC_PATH_PROG(MSGFMT, msgfmt) -+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) - fi --AC_MSG_RESULT(yes)]) -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_INSTALL_STRIP --# --------------------- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) -+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) - fi --INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -- --# Copyright (C) 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. - --# _AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- --# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. --# This macro is traced by Automake. --AC_DEFUN([_AM_SUBST_NOTMAKE]) -- --# Check how to create a tarball. -*- Autoconf -*- -+# Use the tools built into the package, not the ones that are installed. -+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') - --# Copyright (C) 2004, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+AC_PATH_PROG(INTLTOOL_PERL, perl) -+if test -z "$INTLTOOL_PERL"; then -+ AC_MSG_ERROR([perl not found; required for intltool]) -+fi -+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then -+ AC_MSG_ERROR([perl 5.x required for intltool]) -+fi -+if test "x$2" != "xno-xml"; then -+ AC_MSG_CHECKING([for XML::Parser]) -+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -+ AC_MSG_RESULT([ok]) -+ else -+ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ fi -+fi - --# serial 2 -+# Substitute ALL_LINGUAS so we can use it in po/Makefile -+AC_SUBST(ALL_LINGUAS) - --# _AM_PROG_TAR(FORMAT) --# -------------------- --# Check how to create a tarball in format FORMAT. --# FORMAT should be one of `v7', `ustar', or `pax'. --# --# Substitute a variable $(am__tar) that is a command --# writing to stdout a FORMAT-tarball containing the directory --# $tardir. --# tardir=directory && $(am__tar) > result.tar --# --# Substitute a variable $(am__untar) that extract such --# a tarball read from stdin. --# $(am__untar) < result.tar --AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. --AM_MISSING_PROG([AMTAR], [tar]) --m4_if([$1], [v7], -- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -- [m4_case([$1], [ustar],, [pax],, -- [m4_fatal([Unknown tar format])]) --AC_MSG_CHECKING([how to create a $1 tar archive]) --# Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' --_am_tools=${am_cv_prog_tar_$1-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- AM_RUN_LOG([$_am_tar --version]) && break -- done -- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x $1 -w "$$tardir"' -- am__tar_='pax -L -x $1 -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -- am__untar='cpio -i -H $1 -d' -+# Set DATADIRNAME correctly if it is not set yet -+# (copied from glib-gettext.m4) -+if test -z "$DATADIRNAME"; then -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[]], -+ [[extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr]])], -+ [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 -+ dnl in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -+ *) -+ [DATADIRNAME=lib] - ;; -- esac -- -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_$1}" && break -- -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -- rm -rf conftest.dir -- if test -s conftest.tar; then -- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -- fi --done --rm -rf conftest.dir -+ esac]) -+fi -+AC_SUBST(DATADIRNAME) - --AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) --AC_MSG_RESULT([$am_cv_prog_tar_$1])]) --AC_SUBST([am__tar]) --AC_SUBST([am__untar]) --]) # _AM_PROG_TAR -+IT_PO_SUBDIR([po]) - --dnl AM_GCONF_SOURCE_2 --dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas --dnl (i.e. pass to gconftool-2 --dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where --dnl you should install foo.schemas files -+dnl The following is very similar to -+dnl -+dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) - dnl -+dnl with the following slight differences: -+dnl - the *.in files are in ac_aux_dir, -+dnl - if the file haven't changed upon reconfigure, it's not touched, -+dnl - the evaluation of the third parameter enables a hack which computes -+dnl the actual value of $libdir, -+dnl - the user sees "executing intltool commands", instead of -+dnl "creating intltool-extract" and such. -+dnl -+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -+dnl a reason for it. - --AC_DEFUN([AM_GCONF_SOURCE_2], --[ -- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+AC_CONFIG_COMMANDS([intltool], [ -+ -+for file in intltool-extract intltool-merge intltool-update; do -+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ -+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ -+ < ${ac_aux_dir}/${file}.in > ${file}.out -+ if cmp -s ${file} ${file}.out 2>/dev/null; then -+ rm -f ${file}.out - else -- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ mv -f ${file}.out ${file} - fi -+ chmod ugo+x ${file} -+ chmod u+w ${file} -+done - -- AC_ARG_WITH(gconf-source, -- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) -+], -+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) - -- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+]) - -- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -- fi - -- AC_ARG_WITH(gconf-schema-file-dir, -- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) -+# IT_PO_SUBDIR(DIRNAME) -+# --------------------- -+# All po subdirs have to be declared with this macro; the subdir "po" is -+# declared by IT_PROG_INTLTOOL. -+# -+AC_DEFUN([IT_PO_SUBDIR], -+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -+dnl -+dnl The following CONFIG_COMMANDS should be exetuted at the very end -+dnl of config.status. -+AC_CONFIG_COMMANDS_PRE([ -+ AC_CONFIG_COMMANDS([$1/stamp-it], [ -+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" -+ >"$1/stamp-it.tmp" -+ [sed '/^#/d -+ s/^[[].*] *// -+ /^[ ]*$/d -+ '"s|^| $ac_top_srcdir/|" \ -+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" -+ ] -+ if test ! -f "$1/Makefile"; then -+ AC_MSG_ERROR([$1/Makefile is not ready.]) -+ fi -+ mv "$1/Makefile" "$1/Makefile.tmp" -+ [sed '/^POTFILES =/,/[^\\]$/ { -+ /^POTFILES =/!d -+ r $1/POTFILES -+ } -+ ' "$1/Makefile.tmp" >"$1/Makefile"] -+ rm -f "$1/Makefile.tmp" -+ mv "$1/stamp-it.tmp" "$1/stamp-it" -+ ]) -+])dnl -+]) - -- AC_SUBST(GCONF_SCHEMA_FILE_DIR) -- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - -- AC_ARG_ENABLE(schemas-install, -- [ --disable-schemas-install Disable the schemas installation], -- [case ${enableval} in -- yes|no) ;; -- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; -- esac]) -- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) --]) -+# deprecated macros -+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -+# A hint is needed for aclocal from Automake <= 1.9.4: -+# AC_DEFUN([AC_PROG_INTLTOOL], ...) -+ - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -@@ -7780,438 +7563,914 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - --# Copyright (C) 1995-2002 Free Software Foundation, Inc. --# Copyright (C) 2001-2003,2004 Red Hat, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, 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 is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.10' -+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -+dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.10.1], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+]) -+ -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) -+ -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # --# 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. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. - # --# Macro to add for using GNU gettext. --# Ulrich Drepper , 1995, 1996 -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. - # --# Modified to never use included libintl. --# Owen Taylor , 12/15/1998 -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir - # --# Major rework to remove unused code --# Owen Taylor , 12/11/2002 -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. - # --# Added better handling of ALL_LINGUAS from GNU gettext version --# written by Bruno Haible, Owen Taylor 5/30/3002 -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. - # --# Modified to require ngettext --# Matthias Clasen 08/06/2004 -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. -+ -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) -+ -+ -+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -+# Free Software Foundation, Inc. - # --# 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) -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --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 -+# serial 4 - --# 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 ], [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 file defines LC_MESSAGES.]) -- fi -- fi]) -+# This was merged into AC_PROG_CC in Autoconf. - --# 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" -+AU_DEFUN([AM_PROG_CC_STDC], -+[AC_PROG_CC -+AC_DIAGNOSE([obsolete], [$0: -+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon -+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when -+ you adjust the code. You can also remove the above call to -+ AC_PROG_CC if you already called it elsewhere.]) -+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -+]) -+AU_DEFUN([fp_PROG_CC_STDC]) -+ -+# AM_CONDITIONAL -*- Autoconf -*- -+ -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 8 -+ -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' -+else -+ $1_TRUE='#' -+ $1_FALSE= -+fi -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 9 -+ -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+ -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl -+ -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) -+ -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else - break - fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ 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) -+ -+ cd .. -+ rm -rf conftest.dir - else -- AC_MSG_RESULT(no) -+ am_cv_$1_dependencies_compiler_type=none - fi --AC_SUBST($1)dnl -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) - ]) - --# GLIB_WITH_NLS --#----------------- --glib_DEFUN([GLIB_WITH_NLS], -- dnl NLS is obligatory -- [USE_NLS=yes -- AC_SUBST(USE_NLS) - -- gt_cv_have_gettext=no -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+]) - -- CATOBJEXT=NONE -- XGETTEXT=: -- INTLLIBS= - -- AC_CHECK_HEADER(libintl.h, -- [gt_cv_func_dgettext_libintl="no" -- libintl_extra_libs="" -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+]) - -- # -- # First check in libc -- # -- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -- [AC_TRY_LINK([ --#include --], -- [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 --], -- [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 -+# Generate code to set up dependency tracking. -*- Autoconf -*- - -- # -- # 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)])]) -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- 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 -+#serial 3 - -- # -- # 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" -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS - -- 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 \n" --"Language-Team: C \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 -- ]) -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+]) - -- if test "$gt_cv_have_gettext" = "yes" ; then -- AC_DEFINE(ENABLE_NLS, 1, -- [always defined to indicate that i18n is enabled]) -- fi -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- 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 -+# serial 8 - -- # We need to process the po/ directory. -- POSUB=po -+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -- AC_OUTPUT_COMMANDS( -- [case "$CONFIG_FILES" in *po/Makefile.in*) -- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -- esac]) -+# Do all the work for Automake. -*- Autoconf -*- - -- 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 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2008 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- 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) -- ]) -+# serial 13 - --# 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 -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. - -- 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 -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.60])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi -+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 -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) - -- 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" -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -+]) -+]) -+ -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_arg=$1 -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $_am_arg | $_am_arg:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) -+ -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) -+ -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -+# From Jim Meyering -+ -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+AC_DEFUN([AM_MAINTAINER_MODE], -+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode is disabled by default -+ AC_ARG_ENABLE(maintainer-mode, -+[ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ USE_MAINTAINER_MODE=$enableval, -+ USE_MAINTAINER_MODE=no) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST(MAINT)dnl -+] -+) -+ -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+ -+# Check to see how 'make' treats includes. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU -+fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD - fi -- if test -z "$MKINSTALLDIRS"; then -- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf -+]) -+ -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -+ -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 5 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([missing])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) -+fi -+]) -+ -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_MKDIR_P -+# --------------- -+# Check for `mkdir -p'. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+]) -+ -+# Helper functions for option handling. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -+ -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ -+# Check to make sure that the build environment is sane. -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` - fi -- AC_SUBST(MKINSTALLDIRS) -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then - -- 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="../" -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) - 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"` -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : - else -- localedir=`eval echo "${datadir}/locale"` -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) - 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_MSG_RESULT(yes)]) - --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 -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# 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]) -+# AM_PROG_INSTALL_STRIP -+# --------------------- -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -+# Copyright (C) 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) -+ -+# Check how to create a tarball. -*- Autoconf -*- -+ -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac -+ -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break -+ -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir -+ -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR - --m4_include([m4/gnome-doc-utils.m4]) --m4_include([m4/intltool.m4]) -diff -urNad gnome-system-tools-2.21.92~/config.h.in~ gnome-system-tools-2.21.92/config.h.in~ ---- gnome-system-tools-2.21.92~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-system-tools-2.21.92/config.h.in~ 2008-02-27 16:44:15.000000000 +0100 -@@ -0,0 +1,94 @@ -+/* config.h.in. Generated from configure.in by autoheader. */ -+ -+/* capplets directory */ -+#undef DESKTOP_DATA_DIR -+ -+/* always defined to indicate that i18n is enabled */ -+#undef ENABLE_NLS -+ -+/* frontend files path */ -+#undef FRONTEND_DIR -+ -+/* gettext package name */ -+#undef GETTEXT_PACKAGE -+ -+/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -+#undef HAVE_BIND_TEXTDOMAIN_CODESET -+ -+/* Define to 1 if you have the `dcgettext' function. */ -+#undef HAVE_DCGETTEXT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+#undef HAVE_GETTEXT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define if your file defines LC_MESSAGES. */ -+#undef HAVE_LC_MESSAGES -+ -+/* whether libiw is available */ -+#undef HAVE_LIBIW_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LOCALE_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MEMORY_H -+ -+/* whether PolKit was found */ -+#undef HAVE_POLKIT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* path where UI files will be installed */ -+#undef INTERFACES_DIR -+ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* pixmaps directory */ -+#undef PIXMAPS_DIR -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Version number of package */ -+#undef VERSION -diff -urNad gnome-system-tools-2.21.92~/doc/Makefile.in gnome-system-tools-2.21.92/doc/Makefile.in ---- gnome-system-tools-2.21.92~/doc/Makefile.in 2008-02-26 00:35:03.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = doc - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/network/Makefile.in gnome-system-tools-2.21.92/doc/network/Makefile.in ---- gnome-system-tools-2.21.92~/doc/network/Makefile.in 2008-02-26 00:35:03.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/network/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -59,8 +59,7 @@ - $(top_srcdir)/gnome-doc-utils.make ChangeLog - subdir = doc/network - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/services/Makefile.in gnome-system-tools-2.21.92/doc/services/Makefile.in ---- gnome-system-tools-2.21.92~/doc/services/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/services/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -59,8 +59,7 @@ - $(top_srcdir)/gnome-doc-utils.make ChangeLog - subdir = doc/services - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/services/nl/Makefile.in gnome-system-tools-2.21.92/doc/services/nl/Makefile.in ---- gnome-system-tools-2.21.92~/doc/services/nl/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/services/nl/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -97,8 +97,7 @@ - $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make - subdir = doc/services/nl - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/shares/Makefile.in gnome-system-tools-2.21.92/doc/shares/Makefile.in ---- gnome-system-tools-2.21.92~/doc/shares/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/shares/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -59,8 +59,7 @@ - $(top_srcdir)/gnome-doc-utils.make ChangeLog - subdir = doc/shares - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/time/Makefile.in gnome-system-tools-2.21.92/doc/time/Makefile.in ---- gnome-system-tools-2.21.92~/doc/time/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/time/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -59,8 +59,7 @@ - $(top_srcdir)/gnome-doc-utils.make ChangeLog - subdir = doc/time - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/time/nl/Makefile.in gnome-system-tools-2.21.92/doc/time/nl/Makefile.in ---- gnome-system-tools-2.21.92~/doc/time/nl/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/time/nl/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -97,8 +97,7 @@ - $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make - subdir = doc/time/nl - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/doc/users/Makefile.in gnome-system-tools-2.21.92/doc/users/Makefile.in ---- gnome-system-tools-2.21.92~/doc/users/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/doc/users/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -59,8 +59,7 @@ - $(top_srcdir)/gnome-doc-utils.make ChangeLog - subdir = doc/users - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/16x16/Makefile.in gnome-system-tools-2.21.92/icons/16x16/Makefile.in ---- gnome-system-tools-2.21.92~/icons/16x16/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/16x16/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons/16x16 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/16x16/apps/Makefile.in gnome-system-tools-2.21.92/icons/16x16/apps/Makefile.in ---- gnome-system-tools-2.21.92~/icons/16x16/apps/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/16x16/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/16x16/apps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/22x22/Makefile.in gnome-system-tools-2.21.92/icons/22x22/Makefile.in ---- gnome-system-tools-2.21.92~/icons/22x22/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/22x22/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons/22x22 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/22x22/apps/Makefile.in gnome-system-tools-2.21.92/icons/22x22/apps/Makefile.in ---- gnome-system-tools-2.21.92~/icons/22x22/apps/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/22x22/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/22x22/apps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/24x24/Makefile.in gnome-system-tools-2.21.92/icons/24x24/Makefile.in ---- gnome-system-tools-2.21.92~/icons/24x24/Makefile.in 2008-02-26 00:35:04.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/24x24/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons/24x24 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/24x24/apps/Makefile.in gnome-system-tools-2.21.92/icons/24x24/apps/Makefile.in ---- gnome-system-tools-2.21.92~/icons/24x24/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/24x24/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/24x24/apps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/32x32/Makefile.in gnome-system-tools-2.21.92/icons/32x32/Makefile.in ---- gnome-system-tools-2.21.92~/icons/32x32/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/32x32/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons/32x32 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/32x32/apps/Makefile.in gnome-system-tools-2.21.92/icons/32x32/apps/Makefile.in ---- gnome-system-tools-2.21.92~/icons/32x32/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/32x32/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/32x32/apps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/48x48/Makefile.in gnome-system-tools-2.21.92/icons/48x48/Makefile.in ---- gnome-system-tools-2.21.92~/icons/48x48/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/48x48/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons/48x48 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/48x48/apps/Makefile.in gnome-system-tools-2.21.92/icons/48x48/apps/Makefile.in ---- gnome-system-tools-2.21.92~/icons/48x48/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/48x48/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/48x48/apps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/48x48/devices/Makefile.in gnome-system-tools-2.21.92/icons/48x48/devices/Makefile.in ---- gnome-system-tools-2.21.92~/icons/48x48/devices/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/48x48/devices/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/48x48/devices - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/Makefile.in gnome-system-tools-2.21.92/icons/Makefile.in ---- gnome-system-tools-2.21.92~/icons/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/scalable/Makefile.in gnome-system-tools-2.21.92/icons/scalable/Makefile.in ---- gnome-system-tools-2.21.92~/icons/scalable/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/scalable/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = icons/scalable - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/icons/scalable/apps/Makefile.in gnome-system-tools-2.21.92/icons/scalable/apps/Makefile.in ---- gnome-system-tools-2.21.92~/icons/scalable/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/icons/scalable/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = icons/scalable/apps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/interfaces/Makefile.in gnome-system-tools-2.21.92/interfaces/Makefile.in ---- gnome-system-tools-2.21.92~/interfaces/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/interfaces/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = interfaces - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/pixmaps/Makefile.in gnome-system-tools-2.21.92/pixmaps/Makefile.in ---- gnome-system-tools-2.21.92~/pixmaps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/pixmaps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = pixmaps - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/Makefile.in gnome-system-tools-2.21.92/src/Makefile.in ---- gnome-system-tools-2.21.92~/src/Makefile.in 2008-02-26 00:35:05.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -34,8 +34,7 @@ - subdir = src - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/common/Makefile.in gnome-system-tools-2.21.92/src/common/Makefile.in ---- gnome-system-tools-2.21.92~/src/common/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/common/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -39,8 +39,7 @@ - subdir = src/common - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -50,18 +49,18 @@ - ARFLAGS = cru - libsetuptool_a_AR = $(AR) $(ARFLAGS) - libsetuptool_a_LIBADD = --am__libsetuptool_a_SOURCES_DIST = gst-dialog.c gst-dialog.h gst-tool.c \ -- gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ -- gst-conf.c gst-conf.h gst-filter.c gst-filter.h \ -- gst-service-role.c gst-service-role.h gst.h \ -- gst-polkit-action.c gst-polkit-action.h gst-polkit-button.c \ -- gst-polkit-button.h -+am__libsetuptool_a_SOURCES_DIST = gst-package.c gst-package.h \ -+ gst-dialog.c gst-dialog.h gst-tool.c gst-tool.h \ -+ gst-platform-dialog.c gst-platform-dialog.h gst-conf.c \ -+ gst-conf.h gst-filter.c gst-filter.h gst-service-role.c \ -+ gst-service-role.h gst.h gst-polkit-action.c \ -+ gst-polkit-action.h gst-polkit-button.c gst-polkit-button.h - @HAVE_POLKIT_TRUE@am__objects_1 = gst-polkit-action.$(OBJEXT) \ - @HAVE_POLKIT_TRUE@ gst-polkit-button.$(OBJEXT) --am_libsetuptool_a_OBJECTS = gst-dialog.$(OBJEXT) gst-tool.$(OBJEXT) \ -- gst-platform-dialog.$(OBJEXT) gst-conf.$(OBJEXT) \ -- gst-filter.$(OBJEXT) gst-service-role.$(OBJEXT) \ -- $(am__objects_1) -+am_libsetuptool_a_OBJECTS = gst-package.$(OBJEXT) gst-dialog.$(OBJEXT) \ -+ gst-tool.$(OBJEXT) gst-platform-dialog.$(OBJEXT) \ -+ gst-conf.$(OBJEXT) gst-filter.$(OBJEXT) \ -+ gst-service-role.$(OBJEXT) $(am__objects_1) - libsetuptool_a_OBJECTS = $(am_libsetuptool_a_OBJECTS) - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -270,10 +269,11 @@ - -DPREFIX=\""$(prefix)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" - --libsetuptool_a_SOURCES = gst-dialog.c gst-dialog.h gst-tool.c \ -- gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ -- gst-conf.c gst-conf.h gst-filter.c gst-filter.h \ -- gst-service-role.c gst-service-role.h gst.h $(am__append_1) -+libsetuptool_a_SOURCES = gst-package.c gst-package.h gst-dialog.c \ -+ gst-dialog.h gst-tool.c gst-tool.h gst-platform-dialog.c \ -+ gst-platform-dialog.h gst-conf.c gst-conf.h gst-filter.c \ -+ gst-filter.h gst-service-role.c gst-service-role.h gst.h \ -+ $(am__append_1) - EXTRA_DIST = CommonMakefile $(headers) - all: all-am - -@@ -325,6 +325,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-conf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-dialog.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-filter.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-package.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-platform-dialog.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-polkit-action.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-polkit-button.Po@am__quote@ -diff -urNad gnome-system-tools-2.21.92~/src/network/Makefile.in gnome-system-tools-2.21.92/src/network/Makefile.in ---- gnome-system-tools-2.21.92~/src/network/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/network/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -39,8 +39,7 @@ - bin_PROGRAMS = network-admin$(EXEEXT) - subdir = src/network - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/services/Makefile.in gnome-system-tools-2.21.92/src/services/Makefile.in ---- gnome-system-tools-2.21.92~/src/services/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/services/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -39,8 +39,7 @@ - bin_PROGRAMS = services-admin$(EXEEXT) - subdir = src/services - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/shares/Makefile.in gnome-system-tools-2.21.92/src/shares/Makefile.in ---- gnome-system-tools-2.21.92~/src/shares/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/shares/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -38,8 +38,7 @@ - bin_PROGRAMS = shares-admin$(EXEEXT) - subdir = src/shares - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/shares/nautilus/Makefile.in gnome-system-tools-2.21.92/src/shares/nautilus/Makefile.in ---- gnome-system-tools-2.21.92~/src/shares/nautilus/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/shares/nautilus/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = src/shares/nautilus - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/time/Makefile.in gnome-system-tools-2.21.92/src/time/Makefile.in ---- gnome-system-tools-2.21.92~/src/time/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/time/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -38,8 +38,7 @@ - bin_PROGRAMS = time-admin$(EXEEXT) - subdir = src/time - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/time/e-map/Makefile.in gnome-system-tools-2.21.92/src/time/e-map/Makefile.in ---- gnome-system-tools-2.21.92~/src/time/e-map/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/time/e-map/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -35,8 +35,7 @@ - subdir = src/time/e-map - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -urNad gnome-system-tools-2.21.92~/src/users/Makefile.in gnome-system-tools-2.21.92/src/users/Makefile.in ---- gnome-system-tools-2.21.92~/src/users/Makefile.in 2008-02-26 00:35:06.000000000 +0100 -+++ gnome-system-tools-2.21.92/src/users/Makefile.in 2008-02-27 16:44:15.000000000 +0100 -@@ -39,8 +39,7 @@ - bin_PROGRAMS = users-admin$(EXEEXT) - subdir = src/users - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ -- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in -+am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs reverted: --- gnome-system-tools-2.22.0/debian/patches/26_users_home_dir.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/26_users_home_dir.dpatch @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 26_users_home_dir.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Set the home directory to that of the user if it doesn't already exist - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/src/users/user-settings.c gnome-system-tools-2.22.0/src/users/user-settings.c ---- gnome-system-tools-2.22.0~/src/users/user-settings.c 2008-03-31 16:32:35.000000000 +0100 -+++ gnome-system-tools-2.22.0/src/users/user-settings.c 2008-03-31 16:32:36.000000000 +0100 -@@ -347,9 +347,6 @@ - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_shell"); - set_entry_text (GTK_BIN (widget)->child, oobs_user_get_shell (user)); - -- widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); -- set_entry_text (widget, oobs_user_get_home_directory (user)); -- - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user)); - gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE); -@@ -394,6 +391,11 @@ - if (!login) - table_set_default_profile (GST_USERS_TOOL (tool)); - -+ if (user) { -+ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); -+ set_entry_text (widget, oobs_user_get_home_directory (user)); -+ } -+ - return dialog; - } - reverted: --- gnome-system-tools-2.22.0/debian/patches/85_users_fix_add_group.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/85_users_fix_add_group.dpatch @@ -1,53 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 85_users_fix_add_group.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Set the group name when finished creating a new group. - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/src/users/callbacks.c gnome-system-tools-2.22.0/src/users/callbacks.c ---- gnome-system-tools-2.22.0~/src/users/callbacks.c 2008-03-09 16:07:03.000000000 +0000 -+++ gnome-system-tools-2.22.0/src/users/callbacks.c 2008-04-20 13:12:33.000000000 +0100 -@@ -407,7 +407,7 @@ - response = group_settings_dialog_run (dialog, group); - - if (response == GTK_RESPONSE_OK) { -- group_settings_dialog_get_data (group); -+ group = group_settings_dialog_get_group (); - - config = OOBS_GROUPS_CONFIG (GST_USERS_TOOL (tool)->groups_config); - groups_list = oobs_groups_config_get_groups (config); -diff -urNad gnome-system-tools-2.22.0~/src/users/group-settings.c gnome-system-tools-2.22.0/src/users/group-settings.c ---- gnome-system-tools-2.22.0~/src/users/group-settings.c 2008-03-09 16:07:03.000000000 +0000 -+++ gnome-system-tools-2.22.0/src/users/group-settings.c 2008-04-20 13:14:46.000000000 +0100 -@@ -341,3 +341,19 @@ - - group_members_table_save (group); - } -+ -+OobsGroup* -+group_settings_dialog_get_group (void) -+{ -+ GtkWidget *widget; -+ OobsGroup *group; -+ -+ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_name"); -+ group = oobs_group_new(gtk_entry_get_text (GTK_ENTRY (widget))); -+ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_gid"); -+ oobs_group_set_gid (group, gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget))); -+ -+ group_members_table_save (group); -+ -+ return group; -+} -diff -urNad gnome-system-tools-2.22.0~/src/users/group-settings.h gnome-system-tools-2.22.0/src/users/group-settings.h ---- gnome-system-tools-2.22.0~/src/users/group-settings.h 2008-03-09 16:07:03.000000000 +0000 -+++ gnome-system-tools-2.22.0/src/users/group-settings.h 2008-04-20 13:13:49.000000000 +0100 -@@ -37,6 +37,7 @@ - - gid_t group_settings_find_new_gid (void); - void group_settings_dialog_get_data (OobsGroup *group); -+OobsGroup* group_settings_dialog_get_group (void); - - - #endif /* __GROUP_SETTINGS_H */ reverted: --- gnome-system-tools-2.22.0/debian/patches/10_add_missing_services.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/10_add_missing_services.dpatch @@ -1,48 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_add_postgres82.dpatch by Daniel Holbach -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.18.0~/src/common/gst-service-role.c gnome-system-tools-2.18.0/src/common/gst-service-role.c ---- gnome-system-tools-2.18.0~/src/common/gst-service-role.c 2007-03-12 10:35:53.000000000 +0100 -+++ gnome-system-tools-2.18.0/src/common/gst-service-role.c 2007-03-12 11:19:31.000000000 +0100 -@@ -104,6 +104,7 @@ - { "kdm", GST_ROLE_DISPLAY_MANAGER }, - { "keepalived", GST_ROLE_CLUSTER_MANAGEMENT }, - { "klogd", GST_ROLE_SYSTEM_LOGGER }, -+ { "lighttpd", GST_ROLE_WEB_SERVER }, - { "lm-sensors", GST_ROLE_HARDWARE_MONITORING }, - { "lpd", GST_ROLE_PRINTER_SERVICE }, - { "lpdng", GST_ROLE_PRINTER_SERVICE }, -@@ -176,6 +177,7 @@ - { "syslog", GST_ROLE_SYSTEM_LOGGER }, - { "tftpd-hpa", GST_ROLE_FILE_SERVER_TFTP }, - { "vcron", GST_ROLE_COMMAND_SCHEDULER }, -+ { "vmware-player", GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT }, - { "vsftpd", GST_ROLE_FILE_SERVER_FTP }, - { "wacom-tools", GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT }, - { "wdm", GST_ROLE_DISPLAY_MANAGER }, -diff -urNad gnome-system-tools-2.18.0~/src/common/gst-service-role.h gnome-system-tools-2.18.0/src/common/gst-service-role.h ---- gnome-system-tools-2.18.0~/src/common/gst-service-role.h 2007-03-12 10:35:53.000000000 +0100 -+++ gnome-system-tools-2.18.0/src/common/gst-service-role.h 2007-03-12 11:19:31.000000000 +0100 -@@ -100,6 +100,7 @@ - GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT, - GST_ROLE_HARDWARE_MONITORING, - GST_ROLE_SYSTEM_MONITORING, -+ GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT, - GST_ROLE_NONE - }; - -diff -urNad gnome-system-tools-2.18.0~/src/services/service.c gnome-system-tools-2.18.0/src/services/service.c ---- gnome-system-tools-2.18.0~/src/services/service.c 2007-03-12 10:35:16.000000000 +0100 -+++ gnome-system-tools-2.18.0/src/services/service.c 2007-03-12 11:19:31.000000000 +0100 -@@ -101,6 +101,7 @@ - { FALSE, NULL, N_("Telstra Bigpond Cable Network client"), NULL }, /* GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT */ - { FALSE, NULL, N_("Hardware monitor"), NULL }, /* GST_ROLE_HARDWARE_MONITORING */ - { FALSE, NULL, N_("System monitor"), NULL }, /* GST_ROLE_SYSTEM_MONITORING */ -+ { FALSE, NULL, N_("Virtual Machine management"), NULL }, /* GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT */ - { FALSE } - }; - reverted: --- gnome-system-tools-2.22.0/debian/patches/25_sambashare_group_definition.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/25_sambashare_group_definition.dpatch @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 25_sambashare_group_definition.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/src/users/privileges-table.c gnome-system-tools-2.22.0/src/users/privileges-table.c ---- gnome-system-tools-2.22.0~/src/users/privileges-table.c 2008-03-09 17:07:03.000000000 +0100 -+++ gnome-system-tools-2.22.0/src/users/privileges-table.c 2008-03-28 00:13:35.000000000 +0100 -@@ -55,6 +55,7 @@ - { "fax", N_("Send and receive faxes") }, - { "floppy", N_("Use floppy drives") }, - { "plugdev", N_("Access external storage devices automatically") }, -+ { "sambashare", N_("Share files with the local network") }, - { "scanner", N_("Use scanners") }, - { "tape", N_("Use tape drives") }, - { "wheel", N_("Be able to get administrator privileges") }, reverted: --- gnome-system-tools-2.22.0/debian/patches/00list +++ gnome-system-tools-2.22.0.orig/debian/patches/00list @@ -1,16 +0,0 @@ -10_add_missing_services -11_shares_admin_not_listed_under_gnome.dpatch -18_disable_uid.dpatch -20_fuse_as_default_group -23_users_update_model -24_lpadmin_group_definition.dpatch -25_sambashare_group_definition.dpatch -26_users_home_dir.dpatch -80_gst-packages-common -81_gst-packages-shares-admin -82_gst-packages-time-admin -83_network-locations-apply-button -84_translate_extra_strings.dpatch -85_users_fix_add_group.dpatch -90_from_svn_correctly_configure_interface.dpatch -98_automake reverted: --- gnome-system-tools-2.22.0/debian/patches/24_lpadmin_group_definition.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/24_lpadmin_group_definition.dpatch @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 24_lpadmin_group_definition.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/src/users/privileges-table.c gnome-system-tools-2.22.0/src/users/privileges-table.c ---- gnome-system-tools-2.22.0~/src/users/privileges-table.c 2008-03-14 01:00:02.000000000 +0100 -+++ gnome-system-tools-2.22.0/src/users/privileges-table.c 2008-03-14 01:00:18.000000000 +0100 -@@ -55,6 +55,7 @@ - { "fax", N_("Send and receive faxes") }, - { "floppy", N_("Use floppy drives") }, - { "fuse", N_("Allow use of fuse filesystems like LTSP Thin Client blockdevices") }, -+ { "lpadmin", N_("Manage printers") }, - { "plugdev", N_("Access external storage devices automatically") }, - { "scanner", N_("Use scanners") }, - { "tape", N_("Use tape drives") }, reverted: --- gnome-system-tools-2.22.0/debian/patches/82_gst-packages-time-admin.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/82_gst-packages-time-admin.dpatch @@ -1,42 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 82_gst-packages-time-admin.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.15.3~/src/time/time-tool.c gnome-system-tools-2.15.3/src/time/time-tool.c ---- gnome-system-tools-2.15.3~/src/time/time-tool.c 2006-09-04 03:50:03.000000000 +0200 -+++ gnome-system-tools-2.15.3/src/time/time-tool.c 2006-09-06 12:45:43.000000000 +0200 -@@ -385,5 +385,6 @@ - GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool); - GtkWidget *message, *widget; -+ gint response; - - if (GST_TIME_TOOL (tool)->ntp_service) - return TRUE; -@@ -402,9 +403,23 @@ - _("Please install and activate NTP support in the system to enable " - "synchronization of your local time server with " - "internet time servers.")); -- gtk_dialog_run (GTK_DIALOG (message)); -+ -+ gtk_dialog_add_button (GTK_DIALOG (message), _("Install NTP support"), GTK_RESPONSE_OK); -+ response = gtk_dialog_run (GTK_DIALOG (message)); - gtk_widget_destroy (message); - -+ if (response == GTK_RESPONSE_OK) { -+ const gchar *packages[] = { "ntp", NULL }; -+ -+ if (gst_packages_install (GTK_WINDOW (tool->main_dialog), packages)) { -+ gst_tool_update_config (tool); -+ gst_tool_update_gui (tool); -+ -+ if (GST_TIME_TOOL (tool)->ntp_service) -+ return TRUE; -+ } -+ } -+ - return FALSE; - } - reverted: --- gnome-system-tools-2.22.0/debian/patches/11_shares_admin_not_listed_under_gnome.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/11_shares_admin_not_listed_under_gnome.dpatch @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_shares_admin_not_listed_under_gnome.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/src/shares/shares.desktop.in.in gnome-system-tools-2.22.0/src/shares/shares.desktop.in.in ---- gnome-system-tools-2.22.0~/src/shares/shares.desktop.in.in 2008-03-09 17:07:03.000000000 +0100 -+++ gnome-system-tools-2.22.0/src/shares/shares.desktop.in.in 2008-04-14 14:44:05.000000000 +0200 -@@ -6,6 +6,7 @@ - Terminal=false - Type=Application - Categories=GNOME;GTK;System;Settings;X-GNOME-NetworkSettings; -+NotShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gnome-system-tools - X-GNOME-Bugzilla-Component=shares-admin reverted: --- gnome-system-tools-2.22.0/debian/patches/20_fuse_as_default_group.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/20_fuse_as_default_group.dpatch @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_fuse_as_default_group.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.15.2~/src/users/privileges-table.c gnome-system-tools-2.15.2/src/users/privileges-table.c ---- gnome-system-tools-2.15.2~/src/users/privileges-table.c 2006-05-29 02:48:37.000000000 +0200 -+++ gnome-system-tools-2.15.2/src/users/privileges-table.c 2006-08-23 13:52:16.000000000 +0200 -@@ -54,6 +54,7 @@ - { "dip", N_("Connect to Internet using a modem") }, - { "fax", N_("Send and receive faxes") }, - { "floppy", N_("Use floppy drives") }, -+ { "fuse", N_("Allow use of fuse filesystems like LTSP Thin Client blockdevices") }, - { "plugdev", N_("Access external storage devices automatically") }, - { "scanner", N_("Use scanners") }, - { "tape", N_("Use tape drives") }, reverted: --- gnome-system-tools-2.22.0/debian/patches/23_users_update_model.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/23_users_update_model.dpatch @@ -1,60 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -@DPATCH@ -diff -urNad gnome-system-tools-2.21.3~/src/users/callbacks.c gnome-system-tools-2.21.3/src/users/callbacks.c ---- gnome-system-tools-2.21.3~/src/users/callbacks.c 2007-11-14 16:31:22.000000000 +0100 -+++ gnome-system-tools-2.21.3/src/users/callbacks.c 2007-12-19 16:38:31.000000000 +0100 -@@ -284,6 +284,9 @@ - users_table_add_user (user, &list_iter); - oobs_object_commit (GST_USERS_TOOL (tool)->users_config); - oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); -+ -+ gst_tool_update_config (tool); -+ gst_tool_update_gui (tool); - } - } - -@@ -369,6 +372,10 @@ - g_list_free (list); - - oobs_object_commit (GST_USERS_TOOL (tool)->users_config); -+ oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); -+ -+ gst_tool_update_config (tool); -+ gst_tool_update_gui (tool); - } - - void -@@ -412,6 +419,9 @@ - - groups_table_add_group (group, &list_iter); - oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); -+ -+ gst_tool_update_config (tool); -+ gst_tool_update_gui (tool); - } - } - -@@ -451,7 +461,11 @@ - &filter_iter, &iter); - group_settings_dialog_get_data (group); - groups_table_set_group (group, list_iter, &filter_iter); -+ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); - oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); -+ -+ gst_tool_update_config (tool); -+ gst_tool_update_gui (tool); - } - - g_object_unref (group); -@@ -479,7 +493,11 @@ - g_list_foreach (list, (GFunc) gtk_tree_row_reference_free, NULL); - g_list_free (list); - -+ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); - oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); -+ -+ gst_tool_update_config (tool); -+ gst_tool_update_gui (tool); - } - - /* User settings callbacks */ reverted: --- gnome-system-tools-2.22.0/debian/patches/81_gst-packages-shares-admin.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/81_gst-packages-shares-admin.dpatch @@ -1,87 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 81_gst-packages-shares-admin.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.15.3~/src/shares/shares-tool.c gnome-system-tools-2.15.3/src/shares/shares-tool.c ---- gnome-system-tools-2.15.3~/src/shares/shares-tool.c 2006-09-04 04:56:41.000000000 +0200 -+++ gnome-system-tools-2.15.3/src/shares/shares-tool.c 2006-09-06 12:43:41.000000000 +0200 -@@ -138,9 +138,36 @@ - } - - static gboolean -+install_packages (GstTool *tool, gboolean install_nfs, gboolean install_smb) -+{ -+ gchar **packages; -+ gboolean retval; -+ gint i = 0; -+ -+ if (!install_nfs && !install_smb) -+ return FALSE; -+ -+ packages = g_new0 (gchar*, 3); -+ -+ if (install_nfs) -+ packages[i++] = g_strdup ("nfs-kernel-server"); -+ -+ if (install_smb) -+ packages[i++] = g_strdup ("samba"); -+ -+ retval = gst_packages_install (GTK_WINDOW (tool->main_dialog), packages); -+ g_strfreev (packages); -+ -+ return retval; -+} -+ -+static gboolean - check_servers (GstSharesTool *tool) - { - GtkWidget *dialog; -+ GtkWidget *nfs_check, *smb_check; -+ gint response; -+ gboolean retval = FALSE; - - if (tool->smb_available || tool->nfs_available) - return TRUE; -@@ -153,10 +180,36 @@ - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - _("You need to install at least either Samba or NFS " - "in order to share your folders.")); -- gtk_dialog_run (GTK_DIALOG (dialog)); -- gtk_widget_destroy (dialog); -+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Install services"), GTK_RESPONSE_OK); - -- return FALSE; -+ /* add NFS checkbutton */ -+ nfs_check = gtk_check_button_new_with_mnemonic (_("Install Unix networks support (_NFS)")); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nfs_check), TRUE); -+ gtk_widget_show (nfs_check); -+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), nfs_check); -+ -+ /* add SMB checkbutton */ -+ smb_check = gtk_check_button_new_with_mnemonic (_("Install Windows networks support (_SMB)")); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (smb_check), TRUE); -+ gtk_widget_show (smb_check); -+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), smb_check); -+ -+ response = gtk_dialog_run (GTK_DIALOG (dialog)); -+ gtk_widget_hide (dialog); -+ -+ if (response == GTK_RESPONSE_OK) { -+ if (install_packages (GST_TOOL (tool), -+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (nfs_check)), -+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (smb_check)))) { -+ gst_tool_update_config (GST_TOOL (tool)); -+ gst_tool_update_gui (GST_TOOL (tool)); -+ -+ retval = TRUE; -+ } -+ } -+ -+ gtk_widget_destroy (dialog); -+ return retval; - } - - static void reverted: --- gnome-system-tools-2.22.0/debian/patches/90_from_svn_correctly_configure_interface.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/90_from_svn_correctly_configure_interface.dpatch @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_from_svn_correctly_configure_interface.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/src/network/connection.c gnome-system-tools-2.22.0/src/network/connection.c ---- gnome-system-tools-2.22.0~/src/network/connection.c 2008-03-09 17:07:02.000000000 +0100 -+++ gnome-system-tools-2.22.0/src/network/connection.c 2008-04-14 14:31:35.000000000 +0200 -@@ -802,8 +802,9 @@ - void - connection_save (GstConnectionDialog *dialog) - { -- gboolean active; -+ gboolean active, was_configured; - -+ was_configured = oobs_iface_get_configured (dialog->iface); - active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->connection_configured)); - - if (OOBS_IS_IFACE_PPP (dialog->iface)) -@@ -819,6 +820,16 @@ - plip_dialog_save (dialog); - - oobs_iface_set_configured (dialog->iface, active); -+ -+ if (!was_configured) -+ oobs_iface_set_active (dialog->iface, TRUE); -+ -+ /* sync auto and active, this may happen either because -+ * it was just set active, or the interface was already -+ * manually configured, but not marked as auto. -+ */ -+ if (oobs_iface_get_active (dialog->iface)) -+ oobs_iface_set_auto (dialog->iface, TRUE); - } - - void reverted: --- gnome-system-tools-2.22.0/debian/patches/84_translate_extra_strings.dpatch +++ gnome-system-tools-2.22.0.orig/debian/patches/84_translate_extra_strings.dpatch @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 84_translate_extra_strings.dpatch by Sebastien Bacher -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gnome-system-tools-2.22.0~/interfaces/shares.ui gnome-system-tools-2.22.0/interfaces/shares.ui ---- gnome-system-tools-2.22.0~/interfaces/shares.ui 2008-03-09 17:07:02.000000000 +0100 -+++ gnome-system-tools-2.22.0/interfaces/shares.ui 2008-03-13 18:35:00.000000000 +0100 -@@ -47,7 +47,7 @@ - True - True - True -- Share -+ Share - True - GTK_RELIEF_NORMAL - True -diff -urNad gnome-system-tools-2.22.0~/src/shares/share-settings.c gnome-system-tools-2.22.0/src/shares/share-settings.c ---- gnome-system-tools-2.22.0~/src/shares/share-settings.c 2008-03-09 17:07:03.000000000 +0100 -+++ gnome-system-tools-2.22.0/src/shares/share-settings.c 2008-03-13 18:35:01.000000000 +0100 -@@ -459,14 +459,14 @@ - share = table_get_share_at_iter (iter, &list_iter); - share_settings_set_share (share); - -- title = g_strdup_printf ("Settings for folder '%s'", -+ title = g_strdup_printf (_("Settings for folder '%s'"), - oobs_share_get_path (share)); - gtk_window_set_title (GTK_WINDOW (dialog), title); - g_free (title); - } else { - name_entry = gst_dialog_get_widget (tool->main_dialog, "share_smb_name"); - g_object_set_data (G_OBJECT (name_entry), "modified", GINT_TO_POINTER (FALSE)); -- gtk_window_set_title (GTK_WINDOW (dialog), "Share Folder"); -+ gtk_window_set_title (GTK_WINDOW (dialog), _("Share Folder")); - - if (!path) { - /* make sure the path entry gets filled in */ diff -u gnome-system-tools-2.22.0/debian/control gnome-system-tools-2.22.0/debian/control --- gnome-system-tools-2.22.0/debian/control +++ gnome-system-tools-2.22.0/debian/control @@ -3,37 +3,36 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Jose Carlos Garcia Sogo -Uploaders: Debian GNOME Maintainers , +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Niv Sardi Build-Depends: cdbs (>= 0.4.41), autotools-dev, - dpatch, - patchutils, + intltool (>= 0.35.0), + quilt, debhelper (>= 5), - zlib1g-dev, - libpopt-dev, - gettext, - python, - libxml2-dev, + liboobs-1-dev (>= 2.21.3), + libgtk2.0-dev (>= 2.11.3), + cracklib2-dev, + libglib2.0-dev (>= 2.15.2), libgconf2-dev (>= 2.10.0-1), + libdbus-1-dev (>= 0.32), + libiw-dev, + libnautilus-extension-dev (>= 2.10.0-1), + gettext, libxml-parser-perl, gnome-pkg-tools, - scrollkeeper (>= 0.3.14-9.1), - libnautilus-extension-dev (>= 2.10.0-1), + scrollkeeper, gnome-doc-utils (>= 0.3.2), - libgtk2.0-dev (>= 2.9.0), - pkg-config, - liboobs-1-dev (>= 2.21.3), - libiw-dev, libpolkit-dbus-dev (>= 0.5), - libglib2.0-dev (>= 2.15.2) -Standards-Version: 3.7.2 + pkg-config +Standards-Version: 3.7.3 Package: gnome-system-tools Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - perl + perl, + system-tools-backends Recommends: policykit-gnome Conflicts: system-tools-backends (<< 2.2) Suggests: ntp, @@ -55,7 +54,22 @@ Nowadays there are tools for managing: + - Users and groups - Date and time - Network configuration - Services - Shares - - Users and groups + +Package: gnome-network-admin +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + gnome-system-tools +Replaces: gnome-system-tools (<< 2.20.0-3) +Description: GNOME Network Administration Tool + The GNOME System Tools are a fully integrated set of tools aimed to make easy + the job that means the computer administration on an UNIX or Linux system. + They're thought to help from the new Linux or UNIX user to the system + administrators. + . + This package provides network-admin, a program to specify the way your + system connects to other computers and to the Internet. reverted: --- gnome-system-tools-2.22.0/debian/install +++ gnome-system-tools-2.22.0.orig/debian/install @@ -1 +0,0 @@ -debian/pixmaps/* usr/share/gnome-system-tools/pixmaps/ diff -u gnome-system-tools-2.22.0/debian/rules gnome-system-tools-2.22.0/debian/rules --- gnome-system-tools-2.22.0/debian/rules +++ gnome-system-tools-2.22.0/debian/rules @@ -12,10 +12,7 @@ # so you don't need to include those too. include /usr/share/cdbs/1/class/gnome.mk -# must be included after "autotools" (which is included in "gnome") -include /usr/share/cdbs/1/rules/dpatch.mk -# it seems one needs to setup dpatch manually despite the CDBS support -include /usr/share/dpatch/dpatch.make +include /usr/share/cdbs/1/rules/patchsys-quilt.mk LDFLAGS += -Wl,-z,defs -Wl,-O1 @@ -26,13 +23,13 @@ DEB_DH_MAKESHLIBS_ARGS_gnome-system-tools += -n binary-install/gnome-system-tools:: - rm -rf debian/gnome-system-tools/var/scrollkeeper + rm -rfv debian/gnome-system-tools/var/scrollkeeper # boot-admin is disabled (see #309932), also remove some associated files - rm -rf debian/gnome-system-tools/usr/share/omf/boot-admin - rm -rf debian/gnome-system-tools/usr/share/gnome/help/boot-admin - rm -rf debian/gnome-system-tools/usr/share/gnome-system-tools/interfaces/boot.glade - rm -rf debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.png - rm -rf debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.xpm + $(RM) -rfv debian/gnome-system-tools/usr/share/omf/boot-admin + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome/help/boot-admin + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/interfaces/boot.glade + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.png + $(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.xpm # don't install shares-admin since nautilus-share is used now rm -rf debian/gnome-system-tools/usr/lib/nautilus diff -u gnome-system-tools-2.22.0/debian/gnome-system-tools.install gnome-system-tools-2.22.0/debian/gnome-system-tools.install --- gnome-system-tools-2.22.0/debian/gnome-system-tools.install +++ gnome-system-tools-2.22.0/debian/gnome-system-tools.install @@ -1,0 +2,29 @@ +debian/pixmaps/boot.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/disks.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/services.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/shares.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/time.xpm usr/share/gnome-system-tools/pixmaps/ +debian/pixmaps/users.xpm usr/share/gnome-system-tools/pixmaps/ +debian/tmp/etc/gconf +debian/tmp/usr/bin/services-admin +debian/tmp/usr/bin/shares-admin +debian/tmp/usr/bin/time-admin +debian/tmp/usr/bin/users-admin +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/nautilus +debian/tmp/usr/share/locale +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/omf/services-admin +debian/tmp/usr/share/omf/gnome-system-tools +debian/tmp/usr/share/omf/time-admin +debian/tmp/usr/share/omf/users-admin +debian/tmp/usr/share/omf/shares-admin +debian/tmp/usr/share/gnome-system-tools +debian/tmp/usr/share/applications/services.desktop +debian/tmp/usr/share/applications/shares.desktop +debian/tmp/usr/share/applications/time.desktop +debian/tmp/usr/share/applications/users.desktop +debian/tmp/usr/share/gnome/help/services-admin +debian/tmp/usr/share/gnome/help/shares-admin +debian/tmp/usr/share/gnome/help/time-admin +debian/tmp/usr/share/gnome/help/users-admin diff -u gnome-system-tools-2.22.0/debian/changelog gnome-system-tools-2.22.0/debian/changelog --- gnome-system-tools-2.22.0/debian/changelog +++ gnome-system-tools-2.22.0/debian/changelog @@ -1,3 +1,61 @@ +gnome-system-tools (2.22.0-1ubuntu1) intrepid; urgency=low + + * Merge from Debian (LP: #242880). Remaining changes: + - Make it possible to create a group by using the tool by not + ignoring the group name that was chosen. (LP: #205144) + This is debian/patches/85_users_fix_add_group.patch. + - change from svn, correctly configure the network interfaces, + thanks to the different people who worked on the issue (lp: #185854) + debian/patches/90_from_svn_correctly_configure_interface.patch: + - debian/control, debian/control.in: remove gksu from Depends, add + policykit-gnome to Recommends; needed to press the Unlock button + in network-admin, LP: #206198 + - If a user already exists then set the home directory text box + to display their home directory, rather than the default for their + profile. This avoids changing the homedir inadvertantly when + a user's homedir isn't the default for their profile, in + particular the root user on Ubuntu. (LP: #198172) + - list the sambashare group as known so it can be used when adding users + debian/patches/25_sambashare_group_definition.patch: + - debian/patches/22_root_only.patch: + - really remove this change which is not used nor required + - list the lpadmin group as known so it can be used when adding users + (lp: #152107) + debian/patches/24_lpadmin_group_definition.patch: + - translate extra shares admin strings (lp: #200107) + debian/patches/84_translate_extra_strings.patch: + - Build-dep in libpolkit-dbus-dev >=0.5 to get policykit support. + - Update the internal model of users and groups with each operation, so + that it does not become inconsistent with the real world in /etc/passwd + and /etc/group. + - This fixes random errors like "unrelated user was dropped from group + admin", "deleted a different user than the one selected in users-admin", + etc. + - Patch backported from SVN head: + http://svn.gnome.org/viewvc/gnome-system-tools?view=revision&revision=4017 + - LP: #26338 + - debian/patches/23_users_update_model.patch: + - don't Recommends gnome-control-center since the current version + doesn't require it (LP: #137915) + - Replace "Bootloaders" and "Runlevels" with "Services" and "Shares" + in the description. + * Refresh all packages and transition them to quilt patches. + + -- James Westby Tue, 24 Jun 2008 14:05:30 +0100 + +gnome-system-tools (2.22.0-1) unstable; urgency=low + + * New upstream release. + * Massive update to build-dependencies. + + Strip the versioned build-dependency on scrollkeeper. + Closes: #483583. + * Refresh and update patches to apply cleanly. + * 22_root_only.patch: don't switch uid for shares-admin, it does not + connect to the session bus. + * more-groups.patch renamed to 40_more-groups.patch. + + -- Josselin Mouette Mon, 09 Jun 2008 18:34:44 +0200 + gnome-system-tools (2.22.0-0ubuntu9) hardy; urgency=low * Make it possible to create a group by using the tool by not @@ -224,6 +282,79 @@ -- Emilio Pozuelo Monfort Wed, 05 Dec 2007 18:07:38 +0100 +gnome-system-tools (2.20.0-6) unstable; urgency=low + + * Upload to unstable. + * Add -v when rm-ing and use $(RM). + + -- Loic Minier Mon, 26 May 2008 15:25:06 +0200 + +gnome-system-tools (2.20.0-5) experimental; urgency=low + + * Fix list of omf directories to ship in gnome-system-tools. + + -- Loic Minier Tue, 13 May 2008 16:35:35 +0200 + +gnome-system-tools (2.20.0-4) experimental; urgency=low + + * Regenerate debian/pixmaps/shares.xpm with size 32 instead of 48. + + -- Loic Minier Tue, 13 May 2008 16:14:53 +0200 + +gnome-system-tools (2.20.0-3) experimental; urgency=low + + * Add a new gnome-network-admin package for network-admin; based on a patch + by Robert Millan; closes: #460691. + - Target at experimental for NEW. + - gnome-network-admin depends on gnome-system-tools for translations. + - gnome-network-admin replaces gnome-system-tools (<< 2.20.0-3) as it now + ships the help manual, menu files etc. + - Add per package debian/*.install and debian/*.menu files; drop + debian/install and debian/menu. + - Add a new entry in the control file. + * Fix menu entries to use Applications/System/Administration instead of + Apps/System. + * Add a XPM for shares-admin. + + -- Loic Minier Mon, 12 May 2008 21:20:56 +0200 + +gnome-system-tools (2.20.0-2) unstable; urgency=low + + [ Sam Morris ] + * Added more-groups.patch: adds fuse, lpadmin, netdev, powerdev, vboxusers + and video groups to users-admin. + + [ Loic Minier ] + * New patch, 50_min-max-gid, fixes Minimum versus Maximum GID in + users-admin; thanks Kenrick Bingham and Goswin von Brederlow; + GNOME #526590; closes: #305842. + * Depend on system-tools-backends. + * Bump up Standards-Version to 3.7.3. + * Cleanup rules. + * Drop Debian revisions in build-deps. + + -- Loic Minier Sun, 06 Apr 2008 23:33:54 +0200 + +gnome-system-tools (2.20.0-1) unstable; urgency=low + + [ Niv Sardi ] + * Add 02_amd64_fix.patch that should prevent segfaults on AMD64 arch + thanks to Dann Frazier + (closes: #423867: gnome-system-tools: get_services_tool_new() implicitly converted to pointer) + (closes: #423868: gnome-system-tools: connectino_combo_get_value() implicitly converted to pointer) + + [ Josselin Mouette ] + * New upstream release. + * Drop 02_amd64_fix.patch, integrated upstream. + * Build-depend on libdbus-1-dev and intltool. + * Drop build-depends on libxml2-dev, patchutils, zlib1g-dev, + libpopt-dev, libgnomeui-dev and python. + * Switch to quilt for patch handling; build-depend on quilt. + * Refresh patches to apply cleanly. + * Make gksu a dependency. + + -- Josselin Mouette Sun, 25 Nov 2007 13:54:54 +0100 + gnome-system-tools (2.20.0-0ubuntu2) gutsy-proposed; urgency=low * Add debian/patches/23_users_update_model.patch: reverted: --- gnome-system-tools-2.22.0/debian/menu +++ gnome-system-tools-2.22.0.orig/debian/menu @@ -1,25 +0,0 @@ -?package(gnome-system-tools):needs="X11" section="Apps/System"\ - hints="Time"\ - title="Time Admin" command="/usr/bin/time-admin"\ - icon="/usr/share/gnome-system-tools/pixmaps/time.xpm" - -?package(gnome-system-tools):needs="X11" section="Apps/System"\ - hints="Network"\ - title="Network Admin" command="/usr/bin/network-admin"\ - icon="/usr/share/gnome-system-tools/pixmaps/network.xpm" - -?package(gnome-system-tools):needs="X11" section="Apps/System"\ - hints="Network"\ - title="Shares Admin" command="/usr/bin/shares-admin"\ - icon="/usr/share/gnome-system-tools/pixmaps/shares.xpm" - -?package(gnome-system-tools):needs="X11" section="Apps/System"\ - hints="Users"\ - title="User accounts Admin" command="/usr/bin/users-admin"\ - icon="/usr/share/gnome-system-tools/pixmaps/users.xpm" - -?package(gnome-system-tools):needs="X11" section="Apps/System"\ - hints="RunLevel"\ - title="Services Admin" command="/usr/bin/services-admin"\ - icon="/usr/share/gnome-system-tools/pixmaps/services.xpm" - diff -u gnome-system-tools-2.22.0/debian/control.in gnome-system-tools-2.22.0/debian/control.in --- gnome-system-tools-2.22.0/debian/control.in +++ gnome-system-tools-2.22.0/debian/control.in @@ -7,33 +7,32 @@ Niv Sardi Build-Depends: cdbs (>= 0.4.41), autotools-dev, - dpatch, - patchutils, + intltool (>= 0.35.0), + quilt, debhelper (>= 5), - zlib1g-dev, - libpopt-dev, - gettext, - python, - libxml2-dev, + liboobs-1-dev (>= 2.21.3), + libgtk2.0-dev (>= 2.11.3), + cracklib2-dev, + libglib2.0-dev (>= 2.15.2), libgconf2-dev (>= 2.10.0-1), + libdbus-1-dev (>= 0.32), + libiw-dev, + libnautilus-extension-dev (>= 2.10.0-1), + gettext, libxml-parser-perl, gnome-pkg-tools, - scrollkeeper (>= 0.3.14-9.1), - libnautilus-extension-dev (>= 2.10.0-1), + scrollkeeper, gnome-doc-utils (>= 0.3.2), - libgtk2.0-dev (>= 2.9.0), - pkg-config, - liboobs-1-dev (>= 2.21.3), - libiw-dev, libpolkit-dbus-dev (>= 0.5), - libglib2.0-dev (>= 2.15.2) -Standards-Version: 3.7.2 + pkg-config +Standards-Version: 3.7.3 Package: gnome-system-tools Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - perl + perl, + system-tools-backends Recommends: policykit-gnome Conflicts: system-tools-backends (<< 2.2) Suggests: ntp, @@ -55,7 +54,22 @@ Nowadays there are tools for managing: + - Users and groups - Date and time - Network configuration - Services - Shares - - Users and groups + +Package: gnome-network-admin +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + gnome-system-tools +Replaces: gnome-system-tools (<< 2.20.0-3) +Description: GNOME Network Administration Tool + The GNOME System Tools are a fully integrated set of tools aimed to make easy + the job that means the computer administration on an UNIX or Linux system. + They're thought to help from the new Linux or UNIX user to the system + administrators. + . + This package provides network-admin, a program to specify the way your + system connects to other computers and to the Internet. only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/series +++ gnome-system-tools-2.22.0/debian/patches/series @@ -0,0 +1,16 @@ +10_add_missing_services.patch +11_shares_admin_not_listed_under_gnome.patch +18_disable_uid.patch +23_users_update_model.patch +25_sambashare_group_definition.patch +26_users_home_dir.patch +40_more-groups.patch +50_min-max-gid.patch +80_gst-packages-common.patch +81_gst-packages-shares-admin.patch +82_gst-packages-time-admin.patch +83_network-locations-apply-button.patch +84_translate_extra_strings.patch +85_users_fix_add_group.patch +90_from_svn_correctly_configure_interface.patch +98_automake.patch only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/80_gst-packages-common.patch +++ gnome-system-tools-2.22.0/debian/patches/80_gst-packages-common.patch @@ -0,0 +1,279 @@ +Index: ubuntu/src/common/Makefile.am +=================================================================== +--- ubuntu.orig/src/common/Makefile.am 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/Makefile.am 2008-06-24 17:06:50.000000000 +0100 +@@ -9,6 +9,7 @@ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + + libsetuptool_a_SOURCES = \ ++ gst-package.c gst-package.h \ + gst-dialog.c gst-dialog.h \ + gst-tool.c gst-tool.h \ + gst-platform-dialog.c gst-platform-dialog.h \ +Index: ubuntu/src/common/gst-package.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ubuntu/src/common/gst-package.c 2008-06-24 17:06:50.000000000 +0100 +@@ -0,0 +1,211 @@ ++/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ ++/* ++ * Copyright (C) 2004 Vincent Untz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Authors: Vincent Untz ++ * Guillaume Desmottes ++ * Carlos Garnacho ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "gst-package.h" ++ ++static void ++show_error_dialog (GtkWindow *window, ++ const gchar *secondary_text) ++{ ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (window, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_CLOSE, ++ _("Could not install package")); ++ ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++static gboolean ++find_app (GtkWindow *window, ++ const gchar *app) ++{ ++ gchar *path; ++ ++ path = g_find_program_in_path (app); ++ ++ if (!path) ++ { ++ show_error_dialog (window, ++ _("The necessary applications to install" ++ " the package could not be found.")); ++ return FALSE; ++ } ++ ++ g_free (path); ++ ++ return TRUE; ++} ++ ++static gchar * ++create_temp_file (const gchar *packages[]) ++{ ++ int fd; ++ gchar *path, *str; ++ ++ path = g_strdup_printf ("/tmp/packages.XXXXXX"); ++ fd = mkstemp (path); ++ ++ while (*packages) ++ { ++ str = g_strdup_printf ("%s\ti\n", *packages); ++ write (fd, str, strlen (str)); ++ g_free (str); ++ packages++; ++ } ++ ++ close (fd); ++ return path; ++} ++ ++static gchar* ++get_synaptic_command_line (GtkWindow *window, ++ const gchar *path) ++{ ++ gchar *synaptic_path, *command; ++ ++ synaptic_path = g_find_program_in_path ("synaptic"); ++ command = g_strdup_printf ("%s --hide-main-window --non-interactive " ++ "--set-selections-file %s --parent-window-id %d", ++ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window)); ++ g_free (synaptic_path); ++ return command; ++} ++ ++static gboolean ++spawn_synaptic (GtkWindow *window, ++ const gchar *path, ++ gint *child_pid) ++{ ++ gchar **argv; ++ GError *error = NULL; ++ gboolean retval = TRUE; ++ gint i = 0; ++ ++ argv = g_new0 (gchar*, 6); ++ argv[i++] = g_find_program_in_path ("gksudo"); ++ argv[i++] = g_strdup ("--desktop"); ++ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); ++ argv[i++] = g_strdup ("--disable-grab"); ++ argv[i++] = get_synaptic_command_line (window, path); ++ argv[i++] = NULL; ++ ++ if (!gdk_spawn_on_screen (gtk_window_get_screen (window), ++ NULL, argv, NULL, ++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ++ NULL, NULL, child_pid, &error)) ++ { ++ show_error_dialog (window, (error) ? error->message : ""); ++ g_error_free (error); ++ retval = FALSE; ++ } ++ ++ g_strfreev (argv); ++ ++ return retval; ++} ++ ++gboolean ++on_wait_timeout (gpointer data) ++{ ++ gint pid, status; ++ ++ pid = GPOINTER_TO_INT (data); ++ ++ if (waitpid (pid, &status, WNOHANG) > 0) ++ { ++ /* FIXME: should show an error dialog if the installation fails, ++ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */ ++ gtk_main_quit (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++wait_for_synaptic (GtkWindow *window, gint pid) ++{ ++ GdkCursor *cursor; ++ gint timer; ++ ++ cursor = gdk_cursor_new (GDK_WATCH); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); ++ ++ /* wait here a bit until the process has exited */ ++ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); ++ gtk_main (); ++ ++ g_source_remove (timer); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); ++ ++ gdk_cursor_unref (cursor); ++ ++ /* keep this until we can get status ++ * info from the launched process */ ++ return TRUE; ++} ++ ++gboolean ++gst_packages_install (GtkWindow *window, ++ const gchar *packages[]) ++{ ++ gchar *path; ++ pid_t pid; ++ gboolean retval = FALSE; ++ ++ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); ++ ++ if (!find_app (window, "synaptic") || !find_app (window, "gksudo")) ++ return FALSE; ++ ++ path = create_temp_file (packages); ++ ++ if (spawn_synaptic (window, path, &pid)) ++ retval = wait_for_synaptic (window, pid); ++ ++ unlink (path); ++ g_free (path); ++ ++ return retval; ++} +Index: ubuntu/src/common/gst-package.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ubuntu/src/common/gst-package.h 2008-06-24 17:06:50.000000000 +0100 +@@ -0,0 +1,35 @@ ++/* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */ ++/* ++ * Copyright (C) 2004 Vincent Untz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Authors: Carlos Garnacho Parro ++ * Authors: Vincent Untz ++ * Authors: Guillaume Desmottes ++ */ ++ ++#ifndef __GST_PACKAGES_H__ ++#define __GST_PACKAGES_H__ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++gboolean gst_packages_install (GtkWindow *window, const char **packages); ++ ++G_END_DECLS ++ ++#endif /* __GST_PACKAGES_H__ */ +Index: ubuntu/src/common/gst.h +=================================================================== +--- ubuntu.orig/src/common/gst.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/gst.h 2008-06-24 17:06:50.000000000 +0100 +@@ -1,5 +1,6 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + #include ++#include "gst-package.h" + #include "gst-tool.h" + #include "gst-dialog.h" + #include "gst-conf.h" only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/11_shares_admin_not_listed_under_gnome.patch +++ gnome-system-tools-2.22.0/debian/patches/11_shares_admin_not_listed_under_gnome.patch @@ -0,0 +1,12 @@ +Index: ubuntu/src/shares/shares.desktop.in.in +=================================================================== +--- ubuntu.orig/src/shares/shares.desktop.in.in 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/shares/shares.desktop.in.in 2008-06-24 17:04:49.000000000 +0100 +@@ -6,6 +6,7 @@ + Terminal=false + Type=Application + Categories=GNOME;GTK;System;Settings;X-GNOME-NetworkSettings; ++NotShowIn=GNOME; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-system-tools + X-GNOME-Bugzilla-Component=shares-admin only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/23_users_update_model.patch +++ gnome-system-tools-2.22.0/debian/patches/23_users_update_model.patch @@ -0,0 +1,59 @@ +Index: ubuntu/src/users/callbacks.c +=================================================================== +--- ubuntu.orig/src/users/callbacks.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/callbacks.c 2008-06-24 17:07:09.000000000 +0100 +@@ -286,6 +286,9 @@ + users_table_add_user (user, &list_iter); + oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + } + +@@ -373,6 +376,10 @@ + g_list_free (list); + + oobs_object_commit (GST_USERS_TOOL (tool)->users_config); ++ oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + void +@@ -416,6 +423,9 @@ + + groups_table_add_group (group, &list_iter); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + } + +@@ -455,7 +465,11 @@ + &filter_iter, &iter); + group_settings_dialog_get_data (group); + groups_table_set_group (group, list_iter, &filter_iter); ++ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + g_object_unref (group); +@@ -483,7 +497,11 @@ + g_list_foreach (list, (GFunc) gtk_tree_row_reference_free, NULL); + g_list_free (list); + ++ oobs_object_commit (GST_USERS_TOOL (tool)->users_config); + oobs_object_commit (GST_USERS_TOOL (tool)->groups_config); ++ ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); + } + + /* User settings callbacks */ only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/81_gst-packages-shares-admin.patch +++ gnome-system-tools-2.22.0/debian/patches/81_gst-packages-shares-admin.patch @@ -0,0 +1,81 @@ +Index: ubuntu/src/shares/shares-tool.c +=================================================================== +--- ubuntu.orig/src/shares/shares-tool.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/shares/shares-tool.c 2008-06-24 17:06:50.000000000 +0100 +@@ -141,9 +141,36 @@ + } + + static gboolean ++install_packages (GstTool *tool, gboolean install_nfs, gboolean install_smb) ++{ ++ gchar **packages; ++ gboolean retval; ++ gint i = 0; ++ ++ if (!install_nfs && !install_smb) ++ return FALSE; ++ ++ packages = g_new0 (gchar*, 3); ++ ++ if (install_nfs) ++ packages[i++] = g_strdup ("nfs-kernel-server"); ++ ++ if (install_smb) ++ packages[i++] = g_strdup ("samba"); ++ ++ retval = gst_packages_install (GTK_WINDOW (tool->main_dialog), packages); ++ g_strfreev (packages); ++ ++ return retval; ++} ++ ++static gboolean + check_servers (GstSharesTool *tool) + { + GtkWidget *dialog; ++ GtkWidget *nfs_check, *smb_check; ++ gint response; ++ gboolean retval = FALSE; + + if (tool->smb_available || tool->nfs_available) + return TRUE; +@@ -156,10 +183,36 @@ + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + _("You need to install at least either Samba or NFS " + "in order to share your folders.")); +- gtk_dialog_run (GTK_DIALOG (dialog)); +- gtk_widget_destroy (dialog); ++ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Install services"), GTK_RESPONSE_OK); ++ ++ /* add NFS checkbutton */ ++ nfs_check = gtk_check_button_new_with_mnemonic (_("Install Unix networks support (_NFS)")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nfs_check), TRUE); ++ gtk_widget_show (nfs_check); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), nfs_check); ++ ++ /* add SMB checkbutton */ ++ smb_check = gtk_check_button_new_with_mnemonic (_("Install Windows networks support (_SMB)")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (smb_check), TRUE); ++ gtk_widget_show (smb_check); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), smb_check); ++ ++ response = gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_hide (dialog); ++ ++ if (response == GTK_RESPONSE_OK) { ++ if (install_packages (GST_TOOL (tool), ++ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (nfs_check)), ++ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (smb_check)))) { ++ gst_tool_update_config (GST_TOOL (tool)); ++ gst_tool_update_gui (GST_TOOL (tool)); + +- return FALSE; ++ retval = TRUE; ++ } ++ } ++ ++ gtk_widget_destroy (dialog); ++ return retval; + } + + static void only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/25_sambashare_group_definition.patch +++ gnome-system-tools-2.22.0/debian/patches/25_sambashare_group_definition.patch @@ -0,0 +1,12 @@ +Index: ubuntu/src/users/privileges-table.c +=================================================================== +--- ubuntu.orig/src/users/privileges-table.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/privileges-table.c 2008-06-24 17:07:23.000000000 +0100 +@@ -55,6 +55,7 @@ + { "fax", N_("Send and receive faxes") }, + { "floppy", N_("Use floppy drives") }, + { "plugdev", N_("Access external storage devices automatically") }, ++ { "sambashare", N_("Share files with the local network") }, + { "scanner", N_("Use scanners") }, + { "tape", N_("Use tape drives") }, + { "wheel", N_("Be able to get administrator privileges") }, only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/26_users_home_dir.patch +++ gnome-system-tools-2.22.0/debian/patches/26_users_home_dir.patch @@ -0,0 +1,26 @@ +Index: ubuntu/src/users/user-settings.c +=================================================================== +--- ubuntu.orig/src/users/user-settings.c 2008-06-24 17:04:49.000000000 +0100 ++++ ubuntu/src/users/user-settings.c 2008-06-24 17:04:49.000000000 +0100 +@@ -347,9 +347,6 @@ + widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_shell"); + set_entry_text (GTK_BIN (widget)->child, oobs_user_get_shell (user)); + +- widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); +- set_entry_text (widget, oobs_user_get_home_directory (user)); +- + widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user)); + gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE); +@@ -394,6 +391,11 @@ + if (!login) + table_set_default_profile (GST_USERS_TOOL (tool)); + ++ if (user) { ++ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); ++ set_entry_text (widget, oobs_user_get_home_directory (user)); ++ } ++ + return dialog; + } + only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/82_gst-packages-time-admin.patch +++ gnome-system-tools-2.22.0/debian/patches/82_gst-packages-time-admin.patch @@ -0,0 +1,37 @@ +Index: ubuntu/src/time/time-tool.c +=================================================================== +--- ubuntu.orig/src/time/time-tool.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/time/time-tool.c 2008-06-24 17:06:50.000000000 +0100 +@@ -374,6 +374,7 @@ + { + GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool); + GtkWidget *message, *widget; ++ gint response; + + if (GST_TIME_TOOL (tool)->ntp_service) + return TRUE; +@@ -392,9 +393,23 @@ + _("Please install and activate NTP support in the system to enable " + "synchronization of your local time server with " + "internet time servers.")); +- gtk_dialog_run (GTK_DIALOG (message)); ++ ++ gtk_dialog_add_button (GTK_DIALOG (message), _("Install NTP support"), GTK_RESPONSE_OK); ++ response = gtk_dialog_run (GTK_DIALOG (message)); + gtk_widget_destroy (message); + ++ if (response == GTK_RESPONSE_OK) { ++ const gchar *packages[] = { "ntp", NULL }; ++ ++ if (gst_packages_install (GTK_WINDOW (tool->main_dialog), packages)) { ++ gst_tool_update_config (tool); ++ gst_tool_update_gui (tool); ++ ++ if (GST_TIME_TOOL (tool)->ntp_service) ++ return TRUE; ++ } ++ } ++ + return FALSE; + } + only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/83_network-locations-apply-button.patch +++ gnome-system-tools-2.22.0/debian/patches/83_network-locations-apply-button.patch @@ -0,0 +1,204 @@ +Index: ubuntu/interfaces/network.ui +=================================================================== +--- ubuntu.orig/interfaces/network.ui 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/interfaces/network.ui 2008-06-24 17:06:50.000000000 +0100 +@@ -193,6 +193,31 @@ + False + + ++ ++ ++ True ++ Apply location as the current configuration ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ True ++ 4 ++ gtk-apply ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ + + + 0 +Index: ubuntu/src/network/locations-combo.c +=================================================================== +--- ubuntu.orig/src/network/locations-combo.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/locations-combo.c 2008-06-24 17:06:50.000000000 +0100 +@@ -34,6 +34,7 @@ + GtkWidget *combo; + GtkWidget *save_button; + GtkWidget *delete_button; ++ GtkWidget *apply_button; + + GtkWidget *save_dialog; + GtkWidget *location_entry; +@@ -44,7 +45,8 @@ + PROP_TOOL, + PROP_COMBO, + PROP_SAVE, +- PROP_DELETE ++ PROP_DELETE, ++ PROP_APPLY + }; + + static void gst_locations_combo_class_init (GstLocationsComboClass *class); +@@ -108,6 +110,13 @@ + "Delete", + GTK_TYPE_BUTTON, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); ++ g_object_class_install_property (object_class, ++ PROP_APPLY, ++ g_param_spec_object ("apply", ++ "Apply", ++ "Apply", ++ GTK_TYPE_BUTTON, ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + g_type_class_add_private (object_class, + sizeof (GstLocationsComboPrivate)); + } +@@ -137,6 +146,9 @@ + if (priv->delete_button) + g_object_unref (priv->delete_button); + ++ if (priv->apply_button) ++ g_object_unref (priv->apply_button); ++ + if (priv->model) + g_object_unref (priv->model); + } +@@ -166,6 +178,9 @@ + case PROP_DELETE: + priv->delete_button = GTK_WIDGET (g_value_dup_object (value)); + break; ++ case PROP_APPLY: ++ priv->apply_button = GTK_WIDGET (g_value_dup_object (value)); ++ break; + } + } + +@@ -194,6 +209,9 @@ + case PROP_DELETE: + g_value_set_object (value, priv->delete_button); + break; ++ case PROP_APPLY: ++ g_value_set_object (value, priv->apply_button); ++ break; + } + } + +@@ -215,11 +233,9 @@ + gtk_tree_model_get (model, &iter, 0, &str, -1); + gst_network_locations_set_location (locations, str); + gst_tool_update_gui (priv->tool); +- +- oobs_object_commit (locations->hosts_config); +- gst_tool_commit_async (priv->tool, locations->ifaces_config, +- _("Changing network location"), NULL, NULL); + g_free (str); ++ ++ gtk_widget_set_sensitive (priv->apply_button, TRUE); + } + } + +@@ -430,6 +446,22 @@ + } + + static void ++on_apply_button_clicked (GtkWidget *widget, gpointer data) ++{ ++ GstNetworkLocations *locations; ++ GstLocationsComboPrivate *priv; ++ ++ priv = GST_LOCATIONS_COMBO (data)->_priv; ++ locations = GST_NETWORK_LOCATIONS (data); ++ ++ oobs_object_commit (locations->hosts_config); ++ gst_tool_commit_async (priv->tool, locations->ifaces_config, ++ _("Changing network location"), NULL, NULL); ++ ++ gtk_widget_set_sensitive (widget, FALSE); ++} ++ ++static void + fill_model (GstLocationsCombo *combo, + GtkTreeModel *model) + { +@@ -480,6 +512,11 @@ + G_CALLBACK (on_save_button_clicked), object); + g_signal_connect (G_OBJECT (priv->delete_button), "clicked", + G_CALLBACK (on_delete_button_clicked), object); ++ g_signal_connect (G_OBJECT (priv->apply_button), "clicked", ++ G_CALLBACK (on_apply_button_clicked), object); ++ ++ /* set the apply button initially unsensitive */ ++ gtk_widget_set_sensitive (priv->apply_button, FALSE); + + return object; + } +@@ -501,12 +538,14 @@ + gst_locations_combo_new (GstTool *tool, + GtkWidget *combo, + GtkWidget *save, +- GtkWidget *delete) ++ GtkWidget *delete, ++ GtkWidget *apply) + { + return g_object_new (GST_TYPE_LOCATIONS_COMBO, + "tool", tool, + "combo", combo, + "save", save, + "delete", delete, ++ "apply", apply, + NULL); + } +Index: ubuntu/src/network/locations-combo.h +=================================================================== +--- ubuntu.orig/src/network/locations-combo.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/locations-combo.h 2008-06-24 17:06:50.000000000 +0100 +@@ -53,7 +53,8 @@ + GstLocationsCombo* gst_locations_combo_new (GstTool *tool, + GtkWidget *combo, + GtkWidget *add, +- GtkWidget *remove); ++ GtkWidget *remove, ++ GtkWidget *apply); + + + G_END_DECLS +Index: ubuntu/src/network/network-tool.c +=================================================================== +--- ubuntu.orig/src/network/network-tool.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/network-tool.c 2008-06-24 17:06:50.000000000 +0100 +@@ -109,7 +109,7 @@ + { + GObject *object; + GstNetworkTool *tool; +- GtkWidget *widget, *add_button, *delete_button; ++ GtkWidget *widget, *add_button, *delete_button, *apply_button; + + object = (* G_OBJECT_CLASS (gst_network_tool_parent_class)->constructor) (type, + n_construct_properties, +@@ -147,7 +147,8 @@ + widget = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "locations_combo"); + add_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "add_location"); + delete_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "remove_location"); +- tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button); ++ apply_button = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "apply_location"); ++ tool->location = gst_locations_combo_new (GST_TOOL (tool), widget, add_button, delete_button, apply_button); + + tool->dialog = connection_dialog_init (GST_TOOL (tool)); + tool->host_aliases_dialog = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "host_aliases_edit_dialog"); only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/84_translate_extra_strings.patch +++ gnome-system-tools-2.22.0/debian/patches/84_translate_extra_strings.patch @@ -0,0 +1,34 @@ +Index: ubuntu/interfaces/shares.ui +=================================================================== +--- ubuntu.orig/interfaces/shares.ui 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/interfaces/shares.ui 2008-06-24 17:06:51.000000000 +0100 +@@ -47,7 +47,7 @@ + True + True + True +- Share ++ Share + True + GTK_RELIEF_NORMAL + True +Index: ubuntu/src/shares/share-settings.c +=================================================================== +--- ubuntu.orig/src/shares/share-settings.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/shares/share-settings.c 2008-06-24 17:06:51.000000000 +0100 +@@ -459,14 +459,14 @@ + share = table_get_share_at_iter (iter, &list_iter); + share_settings_set_share (share); + +- title = g_strdup_printf ("Settings for folder '%s'", ++ title = g_strdup_printf (_("Settings for folder '%s'"), + oobs_share_get_path (share)); + gtk_window_set_title (GTK_WINDOW (dialog), title); + g_free (title); + } else { + name_entry = gst_dialog_get_widget (tool->main_dialog, "share_smb_name"); + g_object_set_data (G_OBJECT (name_entry), "modified", GINT_TO_POINTER (FALSE)); +- gtk_window_set_title (GTK_WINDOW (dialog), "Share Folder"); ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Share Folder")); + + if (!path) { + /* make sure the path entry gets filled in */ only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/85_users_fix_add_group.patch +++ gnome-system-tools-2.22.0/debian/patches/85_users_fix_add_group.patch @@ -0,0 +1,49 @@ +Index: ubuntu/src/users/callbacks.c +=================================================================== +--- ubuntu.orig/src/users/callbacks.c 2008-06-24 17:04:49.000000000 +0100 ++++ ubuntu/src/users/callbacks.c 2008-06-24 17:06:51.000000000 +0100 +@@ -414,7 +414,7 @@ + response = group_settings_dialog_run (dialog, group); + + if (response == GTK_RESPONSE_OK) { +- group_settings_dialog_get_data (group); ++ group = group_settings_dialog_get_group (); + + config = OOBS_GROUPS_CONFIG (GST_USERS_TOOL (tool)->groups_config); + groups_list = oobs_groups_config_get_groups (config); +Index: ubuntu/src/users/group-settings.c +=================================================================== +--- ubuntu.orig/src/users/group-settings.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/group-settings.c 2008-06-24 17:06:51.000000000 +0100 +@@ -341,3 +341,19 @@ + + group_members_table_save (group); + } ++ ++OobsGroup* ++group_settings_dialog_get_group (void) ++{ ++ GtkWidget *widget; ++ OobsGroup *group; ++ ++ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_name"); ++ group = oobs_group_new(gtk_entry_get_text (GTK_ENTRY (widget))); ++ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_gid"); ++ oobs_group_set_gid (group, gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget))); ++ ++ group_members_table_save (group); ++ ++ return group; ++} +Index: ubuntu/src/users/group-settings.h +=================================================================== +--- ubuntu.orig/src/users/group-settings.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/group-settings.h 2008-06-24 17:06:51.000000000 +0100 +@@ -37,6 +37,7 @@ + + gid_t group_settings_find_new_gid (void); + void group_settings_dialog_get_data (OobsGroup *group); ++OobsGroup* group_settings_dialog_get_group (void); + + + #endif /* __GROUP_SETTINGS_H */ only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/90_from_svn_correctly_configure_interface.patch +++ gnome-system-tools-2.22.0/debian/patches/90_from_svn_correctly_configure_interface.patch @@ -0,0 +1,32 @@ +Index: ubuntu/src/network/connection.c +=================================================================== +--- ubuntu.orig/src/network/connection.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/network/connection.c 2008-06-24 17:06:51.000000000 +0100 +@@ -802,8 +802,9 @@ + void + connection_save (GstConnectionDialog *dialog) + { +- gboolean active; ++ gboolean active, was_configured; + ++ was_configured = oobs_iface_get_configured (dialog->iface); + active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->connection_configured)); + + if (OOBS_IS_IFACE_PPP (dialog->iface)) +@@ -819,6 +820,16 @@ + plip_dialog_save (dialog); + + oobs_iface_set_configured (dialog->iface, active); ++ ++ if (!was_configured) ++ oobs_iface_set_active (dialog->iface, TRUE); ++ ++ /* sync auto and active, this may happen either because ++ * it was just set active, or the interface was already ++ * manually configured, but not marked as auto. ++ */ ++ if (oobs_iface_get_active (dialog->iface)) ++ oobs_iface_set_auto (dialog->iface, TRUE); + } + + void only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/40_more-groups.patch +++ gnome-system-tools-2.22.0/debian/patches/40_more-groups.patch @@ -0,0 +1,22 @@ +Index: ubuntu/src/users/privileges-table.c +=================================================================== +--- ubuntu.orig/src/users/privileges-table.c 2008-06-24 17:04:49.000000000 +0100 ++++ ubuntu/src/users/privileges-table.c 2008-06-24 17:06:30.000000000 +0100 +@@ -53,11 +53,17 @@ + { "dialout", N_("Use modems") }, + { "dip", N_("Connect to Internet using a modem") }, + { "fax", N_("Send and receive faxes") }, ++ { "fuse", N_("Mount user-space filesystems (FUSE)") }, + { "floppy", N_("Use floppy drives") }, ++ { "lpadmin", N_("Configure printers") }, ++ { "netdev", N_("Connect to wireless and ethernet networks") }, + { "plugdev", N_("Access external storage devices automatically") }, ++ { "powerdev", N_("Suspend and hibernate the computer") }, + { "sambashare", N_("Share files with the local network") }, + { "scanner", N_("Use scanners") }, + { "tape", N_("Use tape drives") }, ++ { "vboxusers", N_("Use VirtualBox"), }, ++ { "video", N_("Capture video from TV or Webcams, and use 3d acceleration"), }, + { "wheel", N_("Be able to get administrator privileges") }, + }; + only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/50_min-max-gid.patch +++ gnome-system-tools-2.22.0/debian/patches/50_min-max-gid.patch @@ -0,0 +1,16 @@ +fixes Minimum versus Maximum GID in users-admin; thanks Kenrick Bingham and +Goswin von Brederlow; GNOME #526590; closes: #305842. + +Index: ubuntu/interfaces/users.ui +=================================================================== +--- ubuntu.orig/interfaces/users.ui 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/interfaces/users.ui 2008-06-24 17:06:50.000000000 +0100 +@@ -3114,7 +3114,7 @@ + + + True +- Minimum GID: ++ Maximum GID: + False + False + GTK_JUSTIFY_LEFT only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/18_disable_uid.patch +++ gnome-system-tools-2.22.0/debian/patches/18_disable_uid.patch @@ -0,0 +1,20 @@ +Index: ubuntu/src/users/user-settings.c +=================================================================== +--- ubuntu.orig/src/users/user-settings.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/users/user-settings.c 2008-06-24 17:07:25.000000000 +0100 +@@ -332,6 +332,7 @@ + uid = find_new_uid (GST_USERS_TOOL (tool)->minimum_uid, + GST_USERS_TOOL (tool)->maximum_uid); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), uid); ++ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), TRUE); + setup_profiles_visibility (tool, TRUE); + } else { + g_object_set_data_full (G_OBJECT (dialog), "user", +@@ -351,6 +352,7 @@ + + widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user)); ++ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE); + setup_profiles_visibility (tool, FALSE); + } + only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/10_add_missing_services.patch +++ gnome-system-tools-2.22.0/debian/patches/10_add_missing_services.patch @@ -0,0 +1,44 @@ +Index: ubuntu/src/common/gst-service-role.c +=================================================================== +--- ubuntu.orig/src/common/gst-service-role.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/gst-service-role.c 2008-06-24 17:04:49.000000000 +0100 +@@ -104,6 +104,7 @@ + { "kdm", GST_ROLE_DISPLAY_MANAGER }, + { "keepalived", GST_ROLE_CLUSTER_MANAGEMENT }, + { "klogd", GST_ROLE_SYSTEM_LOGGER }, ++ { "lighttpd", GST_ROLE_WEB_SERVER }, + { "lm-sensors", GST_ROLE_HARDWARE_MONITORING }, + { "lpd", GST_ROLE_PRINTER_SERVICE }, + { "lpdng", GST_ROLE_PRINTER_SERVICE }, +@@ -176,6 +177,7 @@ + { "syslog", GST_ROLE_SYSTEM_LOGGER }, + { "tftpd-hpa", GST_ROLE_FILE_SERVER_TFTP }, + { "vcron", GST_ROLE_COMMAND_SCHEDULER }, ++ { "vmware-player", GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT }, + { "vsftpd", GST_ROLE_FILE_SERVER_FTP }, + { "wacom-tools", GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT }, + { "wdm", GST_ROLE_DISPLAY_MANAGER }, +Index: ubuntu/src/common/gst-service-role.h +=================================================================== +--- ubuntu.orig/src/common/gst-service-role.h 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/common/gst-service-role.h 2008-06-24 17:04:49.000000000 +0100 +@@ -100,6 +100,7 @@ + GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT, + GST_ROLE_HARDWARE_MONITORING, + GST_ROLE_SYSTEM_MONITORING, ++ GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT, + GST_ROLE_NONE + }; + +Index: ubuntu/src/services/service.c +=================================================================== +--- ubuntu.orig/src/services/service.c 2008-06-24 12:04:27.000000000 +0100 ++++ ubuntu/src/services/service.c 2008-06-24 17:04:49.000000000 +0100 +@@ -101,6 +101,7 @@ + { FALSE, NULL, N_("Telstra Bigpond Cable Network client"), NULL }, /* GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT */ + { FALSE, NULL, N_("Hardware monitor"), NULL }, /* GST_ROLE_HARDWARE_MONITORING */ + { FALSE, NULL, N_("System monitor"), NULL }, /* GST_ROLE_SYSTEM_MONITORING */ ++ { FALSE, NULL, N_("Virtual Machine management"), NULL }, /* GST_ROLE_VIRTUAL_MACHINE_MANAGEMENT */ + { FALSE } + }; + only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/patches/98_automake.patch +++ gnome-system-tools-2.22.0/debian/patches/98_automake.patch @@ -0,0 +1,3501 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 98_automake.dpatch by Emilio Pozuelo Monfort +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-system-tools-2.21.92~/Makefile.in gnome-system-tools-2.21.92/Makefile.in +--- gnome-system-tools-2.21.92~/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -39,8 +39,7 @@ + AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ + config.sub depcomp install-sh ltmain.sh missing mkinstalldirs + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +diff -urNad gnome-system-tools-2.21.92~/aclocal.m4 gnome-system-tools-2.21.92/aclocal.m4 +--- gnome-system-tools-2.21.92~/aclocal.m4 2008-02-26 00:35:00.000000000 +0100 ++++ gnome-system-tools-2.21.92/aclocal.m4 2008-02-27 16:44:15.000000000 +0100 +@@ -19,956 +19,739 @@ + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.10' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10.1], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10.1])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ [ --disable-schemas-install Disable the schemas installation], ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++ ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# 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. + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# 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. + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +- +-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +-# Free Software Foundation, Inc. ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-# This was merged into AC_PROG_CC in Autoconf. +- +-AU_DEFUN([AM_PROG_CC_STDC], +-[AC_PROG_CC +-AC_DIAGNOSE([obsolete], [$0: +- your code should no longer depend upon `am_cv_prog_cc_stdc', but upon +- `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when +- you adjust the code. You can also remove the above call to +- AC_PROG_CC if you already called it elsewhere.]) +-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +-]) +-AU_DEFUN([fp_PROG_CC_STDC]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 8 +- +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' +-else +- $1_TRUE='#' +- $1_FALSE= +-fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 9 +- +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +- +- +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 + # +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++# 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) + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub ++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 + +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++# 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 ], [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 file defines LC_MESSAGES.]) ++ fi ++ fi]) + +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else ++# 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 +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi + fi + done +- +- cd .. +- rm -rf conftest.dir ++ 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 +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- +- +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) +- +- +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' ++ AC_MSG_RESULT(no) + fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++AC_SUBST($1)dnl + ]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-#serial 3 +- +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS +- ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++ gt_cv_have_gettext=no + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# serial 8 ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [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 ++], ++ [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 + +-# Do all the work for Automake. -*- Autoconf -*- ++ # ++ # 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)])]) + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ 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 + +-# serial 13 ++ # ++ # 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" + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++ 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 + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.60])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- 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 \n" ++"Language-Team: C \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 ++ ]) + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ 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 + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ # We need to process the po/ directory. ++ POSUB=po + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-]) ++ 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 + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. ++ 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) ++ ]) + +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++# 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 + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ 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 + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) ++ 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 + +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ 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) + +-# serial 2 ++ 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 ++ ]) + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. ++# 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 +- am__leading_dot=_ ++ localedir=`eval echo "${datadir}/locale"` + fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) +- +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++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]) ++]) + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++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 + +-# serial 4 ++# 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]) + +-AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) + +-# serial 3 ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) + ]) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +- +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 5 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) + ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) + else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) + fi +-]) + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac ++GNOME_DOC_DEFINES + ]) + +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 3 + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +- +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 36 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) + +-# serial 4 ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-AC_MSG_RESULT(yes)]) +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# Copyright (C) 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) +- +-# Check how to create a tarball. -*- Autoconf -*- ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi + +-# serial 2 ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) + +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [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 ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false ++ *) ++ [DATADIRNAME=lib] + ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++IT_PO_SUBDIR([po]) + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) + dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. + +-AC_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++AC_CONFIG_COMMANDS([intltool], [ ++ ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out + else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ mv -f ${file}.out ${file} + fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done + +- AC_ARG_WITH(gconf-source, +- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++]) + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi + +- AC_ARG_WITH(gconf-schema-file-dir, +- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + +- AC_ARG_ENABLE(schemas-install, +- [ --disable-schemas-install Disable the schemas installation], +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) ++ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +@@ -7780,438 +7563,914 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, 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 is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) ++ ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +-# 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. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. + # +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. + # +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir + # +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. + # +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. + # +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 ++# Free Software Foundation, Inc. + # +-# 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) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-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 ++# serial 4 + +-# 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 ], [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 file defines LC_MESSAGES.]) +- fi +- fi]) ++# This was merged into AC_PROG_CC in Autoconf. + +-# 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" ++AU_DEFUN([AM_PROG_CC_STDC], ++[AC_PROG_CC ++AC_DIAGNOSE([obsolete], [$0: ++ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon ++ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when ++ you adjust the code. You can also remove the above call to ++ AC_PROG_CC if you already called it elsewhere.]) ++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ++]) ++AU_DEFUN([fp_PROG_CC_STDC]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 9 ++ ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else + break + fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ 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) ++ ++ cd .. ++ rm -rf conftest.dir + else +- AC_MSG_RESULT(no) ++ am_cv_$1_dependencies_compiler_type=none + fi +-AC_SUBST($1)dnl ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + ]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [USE_NLS=yes +- AC_SUBST(USE_NLS) + +- gt_cv_have_gettext=no ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [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 +-], +- [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 ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +- # +- # 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)])]) ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- 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 ++#serial 3 + +- # +- # 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" ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +- 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 \n" +-"Language-Team: C \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 +- ]) ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- 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 ++# serial 8 + +- # We need to process the po/ directory. +- POSUB=po ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++# Do all the work for Automake. -*- Autoconf -*- + +- 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 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- 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) +- ]) ++# serial 13 + +-# 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 ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +- 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 ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.60])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi ++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 ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) + +- 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" ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++]) ++ ++ ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD + fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++ ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 5 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` + fi +- AC_SUBST(MKINSTALLDIRS) ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then + +- 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="../" ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) + 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"` ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : + else +- localedir=`eval echo "${datadir}/locale"` ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) + 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_MSG_RESULT(yes)]) + +-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 ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# 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]) ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ ++# Check how to create a tarball. -*- Autoconf -*- ++ ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + +-m4_include([m4/gnome-doc-utils.m4]) +-m4_include([m4/intltool.m4]) +diff -urNad gnome-system-tools-2.21.92~/config.h.in~ gnome-system-tools-2.21.92/config.h.in~ +--- gnome-system-tools-2.21.92~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-system-tools-2.21.92/config.h.in~ 2008-02-27 16:44:15.000000000 +0100 +@@ -0,0 +1,94 @@ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* capplets directory */ ++#undef DESKTOP_DATA_DIR ++ ++/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS ++ ++/* frontend files path */ ++#undef FRONTEND_DIR ++ ++/* gettext package name */ ++#undef GETTEXT_PACKAGE ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the `dcgettext' function. */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ ++/* whether libiw is available */ ++#undef HAVE_LIBIW_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* whether PolKit was found */ ++#undef HAVE_POLKIT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* path where UI files will be installed */ ++#undef INTERFACES_DIR ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* pixmaps directory */ ++#undef PIXMAPS_DIR ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Version number of package */ ++#undef VERSION +diff -urNad gnome-system-tools-2.21.92~/doc/Makefile.in gnome-system-tools-2.21.92/doc/Makefile.in +--- gnome-system-tools-2.21.92~/doc/Makefile.in 2008-02-26 00:35:03.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/network/Makefile.in gnome-system-tools-2.21.92/doc/network/Makefile.in +--- gnome-system-tools-2.21.92~/doc/network/Makefile.in 2008-02-26 00:35:03.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/network/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -59,8 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/network + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/services/Makefile.in gnome-system-tools-2.21.92/doc/services/Makefile.in +--- gnome-system-tools-2.21.92~/doc/services/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/services/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -59,8 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/services + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/services/nl/Makefile.in gnome-system-tools-2.21.92/doc/services/nl/Makefile.in +--- gnome-system-tools-2.21.92~/doc/services/nl/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/services/nl/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -97,8 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = doc/services/nl + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/shares/Makefile.in gnome-system-tools-2.21.92/doc/shares/Makefile.in +--- gnome-system-tools-2.21.92~/doc/shares/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/shares/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -59,8 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/shares + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/time/Makefile.in gnome-system-tools-2.21.92/doc/time/Makefile.in +--- gnome-system-tools-2.21.92~/doc/time/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/time/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -59,8 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/time + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/time/nl/Makefile.in gnome-system-tools-2.21.92/doc/time/nl/Makefile.in +--- gnome-system-tools-2.21.92~/doc/time/nl/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/time/nl/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -97,8 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = doc/time/nl + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/doc/users/Makefile.in gnome-system-tools-2.21.92/doc/users/Makefile.in +--- gnome-system-tools-2.21.92~/doc/users/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/doc/users/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -59,8 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = doc/users + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/16x16/Makefile.in gnome-system-tools-2.21.92/icons/16x16/Makefile.in +--- gnome-system-tools-2.21.92~/icons/16x16/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/16x16/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons/16x16 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/16x16/apps/Makefile.in gnome-system-tools-2.21.92/icons/16x16/apps/Makefile.in +--- gnome-system-tools-2.21.92~/icons/16x16/apps/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/16x16/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/16x16/apps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/22x22/Makefile.in gnome-system-tools-2.21.92/icons/22x22/Makefile.in +--- gnome-system-tools-2.21.92~/icons/22x22/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/22x22/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons/22x22 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/22x22/apps/Makefile.in gnome-system-tools-2.21.92/icons/22x22/apps/Makefile.in +--- gnome-system-tools-2.21.92~/icons/22x22/apps/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/22x22/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/22x22/apps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/24x24/Makefile.in gnome-system-tools-2.21.92/icons/24x24/Makefile.in +--- gnome-system-tools-2.21.92~/icons/24x24/Makefile.in 2008-02-26 00:35:04.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/24x24/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons/24x24 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/24x24/apps/Makefile.in gnome-system-tools-2.21.92/icons/24x24/apps/Makefile.in +--- gnome-system-tools-2.21.92~/icons/24x24/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/24x24/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/24x24/apps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/32x32/Makefile.in gnome-system-tools-2.21.92/icons/32x32/Makefile.in +--- gnome-system-tools-2.21.92~/icons/32x32/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/32x32/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons/32x32 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/32x32/apps/Makefile.in gnome-system-tools-2.21.92/icons/32x32/apps/Makefile.in +--- gnome-system-tools-2.21.92~/icons/32x32/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/32x32/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/32x32/apps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/48x48/Makefile.in gnome-system-tools-2.21.92/icons/48x48/Makefile.in +--- gnome-system-tools-2.21.92~/icons/48x48/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/48x48/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons/48x48 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/48x48/apps/Makefile.in gnome-system-tools-2.21.92/icons/48x48/apps/Makefile.in +--- gnome-system-tools-2.21.92~/icons/48x48/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/48x48/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/48x48/apps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/48x48/devices/Makefile.in gnome-system-tools-2.21.92/icons/48x48/devices/Makefile.in +--- gnome-system-tools-2.21.92~/icons/48x48/devices/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/48x48/devices/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/48x48/devices + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/Makefile.in gnome-system-tools-2.21.92/icons/Makefile.in +--- gnome-system-tools-2.21.92~/icons/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/scalable/Makefile.in gnome-system-tools-2.21.92/icons/scalable/Makefile.in +--- gnome-system-tools-2.21.92~/icons/scalable/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/scalable/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = icons/scalable + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/icons/scalable/apps/Makefile.in gnome-system-tools-2.21.92/icons/scalable/apps/Makefile.in +--- gnome-system-tools-2.21.92~/icons/scalable/apps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/icons/scalable/apps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = icons/scalable/apps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/interfaces/Makefile.in gnome-system-tools-2.21.92/interfaces/Makefile.in +--- gnome-system-tools-2.21.92~/interfaces/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/interfaces/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = interfaces + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/pixmaps/Makefile.in gnome-system-tools-2.21.92/pixmaps/Makefile.in +--- gnome-system-tools-2.21.92~/pixmaps/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/pixmaps/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = pixmaps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/Makefile.in gnome-system-tools-2.21.92/src/Makefile.in +--- gnome-system-tools-2.21.92~/src/Makefile.in 2008-02-26 00:35:05.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -34,8 +34,7 @@ + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/common/Makefile.in gnome-system-tools-2.21.92/src/common/Makefile.in +--- gnome-system-tools-2.21.92~/src/common/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/common/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -39,8 +39,7 @@ + subdir = src/common + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -50,18 +49,18 @@ + ARFLAGS = cru + libsetuptool_a_AR = $(AR) $(ARFLAGS) + libsetuptool_a_LIBADD = +-am__libsetuptool_a_SOURCES_DIST = gst-dialog.c gst-dialog.h gst-tool.c \ +- gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ +- gst-conf.c gst-conf.h gst-filter.c gst-filter.h \ +- gst-service-role.c gst-service-role.h gst.h \ +- gst-polkit-action.c gst-polkit-action.h gst-polkit-button.c \ +- gst-polkit-button.h ++am__libsetuptool_a_SOURCES_DIST = gst-package.c gst-package.h \ ++ gst-dialog.c gst-dialog.h gst-tool.c gst-tool.h \ ++ gst-platform-dialog.c gst-platform-dialog.h gst-conf.c \ ++ gst-conf.h gst-filter.c gst-filter.h gst-service-role.c \ ++ gst-service-role.h gst.h gst-polkit-action.c \ ++ gst-polkit-action.h gst-polkit-button.c gst-polkit-button.h + @HAVE_POLKIT_TRUE@am__objects_1 = gst-polkit-action.$(OBJEXT) \ + @HAVE_POLKIT_TRUE@ gst-polkit-button.$(OBJEXT) +-am_libsetuptool_a_OBJECTS = gst-dialog.$(OBJEXT) gst-tool.$(OBJEXT) \ +- gst-platform-dialog.$(OBJEXT) gst-conf.$(OBJEXT) \ +- gst-filter.$(OBJEXT) gst-service-role.$(OBJEXT) \ +- $(am__objects_1) ++am_libsetuptool_a_OBJECTS = gst-package.$(OBJEXT) gst-dialog.$(OBJEXT) \ ++ gst-tool.$(OBJEXT) gst-platform-dialog.$(OBJEXT) \ ++ gst-conf.$(OBJEXT) gst-filter.$(OBJEXT) \ ++ gst-service-role.$(OBJEXT) $(am__objects_1) + libsetuptool_a_OBJECTS = $(am_libsetuptool_a_OBJECTS) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -270,10 +269,11 @@ + -DPREFIX=\""$(prefix)"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + +-libsetuptool_a_SOURCES = gst-dialog.c gst-dialog.h gst-tool.c \ +- gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ +- gst-conf.c gst-conf.h gst-filter.c gst-filter.h \ +- gst-service-role.c gst-service-role.h gst.h $(am__append_1) ++libsetuptool_a_SOURCES = gst-package.c gst-package.h gst-dialog.c \ ++ gst-dialog.h gst-tool.c gst-tool.h gst-platform-dialog.c \ ++ gst-platform-dialog.h gst-conf.c gst-conf.h gst-filter.c \ ++ gst-filter.h gst-service-role.c gst-service-role.h gst.h \ ++ $(am__append_1) + EXTRA_DIST = CommonMakefile $(headers) + all: all-am + +@@ -325,6 +325,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-conf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-filter.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-package.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-platform-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-polkit-action.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-polkit-button.Po@am__quote@ +diff -urNad gnome-system-tools-2.21.92~/src/network/Makefile.in gnome-system-tools-2.21.92/src/network/Makefile.in +--- gnome-system-tools-2.21.92~/src/network/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/network/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -39,8 +39,7 @@ + bin_PROGRAMS = network-admin$(EXEEXT) + subdir = src/network + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/services/Makefile.in gnome-system-tools-2.21.92/src/services/Makefile.in +--- gnome-system-tools-2.21.92~/src/services/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/services/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -39,8 +39,7 @@ + bin_PROGRAMS = services-admin$(EXEEXT) + subdir = src/services + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/shares/Makefile.in gnome-system-tools-2.21.92/src/shares/Makefile.in +--- gnome-system-tools-2.21.92~/src/shares/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/shares/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -38,8 +38,7 @@ + bin_PROGRAMS = shares-admin$(EXEEXT) + subdir = src/shares + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/shares/nautilus/Makefile.in gnome-system-tools-2.21.92/src/shares/nautilus/Makefile.in +--- gnome-system-tools-2.21.92~/src/shares/nautilus/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/shares/nautilus/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = src/shares/nautilus + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/time/Makefile.in gnome-system-tools-2.21.92/src/time/Makefile.in +--- gnome-system-tools-2.21.92~/src/time/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/time/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -38,8 +38,7 @@ + bin_PROGRAMS = time-admin$(EXEEXT) + subdir = src/time + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/time/e-map/Makefile.in gnome-system-tools-2.21.92/src/time/e-map/Makefile.in +--- gnome-system-tools-2.21.92~/src/time/e-map/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/time/e-map/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = src/time/e-map + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urNad gnome-system-tools-2.21.92~/src/users/Makefile.in gnome-system-tools-2.21.92/src/users/Makefile.in +--- gnome-system-tools-2.21.92~/src/users/Makefile.in 2008-02-26 00:35:06.000000000 +0100 ++++ gnome-system-tools-2.21.92/src/users/Makefile.in 2008-02-27 16:44:15.000000000 +0100 +@@ -39,8 +39,7 @@ + bin_PROGRAMS = users-admin$(EXEEXT) + subdir = src/users + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/pixmaps/shares.xpm +++ gnome-system-tools-2.22.0/debian/pixmaps/shares.xpm @@ -0,0 +1,109 @@ +/* XPM */ +static char *shares[] = { +/* columns rows colors chars-per-pixel */ +"32 32 71 1", +" c #5EB25EB25EB2", +". c #6133626A5E56", +"X c #659B659B659B", +"o c #676268996485", +"O c #69F06B286714", +"+ c #6B696B816B32", +"@ c #6F46707863A0", +"# c #72FA748B660A", +"$ c #735075056A77", +"% c #76BF789A6E7F", +"& c #789A7A876F15", +"* c #72E072DF72E1", +"= c #7B2A7CB57280", +"- c #7B947BC77B21", +"; c #821A83237338", +": c #87D9893077E9", +"> c #83AE84D47B36", +", c #869589077FCB", +"< c #8B178C5F7AA3", +"1 c #847F847F847F", +"2 c #8C4D8DF481EB", +"3 c #8B7D8B7D8B7D", +"4 c #92E594448297", +"5 c #931094568E4F", +"6 c #9CA49E548CAD", +"7 c #94B995189359", +"8 c #975098AF9377", +"9 c #9A3E9BB892D3", +"0 c #9D1F9E189ADC", +"q c #A0D2A20A9303", +"w c #A2A0A35C9BA3", +"e c #AACCABCF9D73", +"r c #A458A4C8A348", +"t c #A788A875A53B", +"y c #ABACAC79A42A", +"u c #ABCDABECAB6B", +"i c #AF45B032A334", +"p c #B50EB638A5F4", +"a c #B765B88FA68E", +"s c #BB61BC63A72A", +"d c #B250B30AADDF", +"f c #B796B8BBA869", +"g c #BD27BE28AA0E", +"h c #B39BB3C6B32C", +"j c #BE52BF4CB2D2", +"k c #BE8CBEA2BE63", +"l c #BFBDC0BFAC3C", +"z c #BF76C045B1C0", +"x c #C029C0F5BF93", +"c c #C1A1C2A0AE72", +"v c #C3CFC4CBB1DB", +"b c #C7FEC8F4B5F8", +"n c #C977CA70B761", +"m c #C14CC201BF38", +"M c #C7DCC8A5B93D", +"N c #CBDFCCB9BD4D", +"B c #CFE2D0BABEE3", +"V c #D069D160BFCF", +"C c #C30BC36EC28F", +"Z c #CEC7CF46C14E", +"A c #CBDBCBDBCBDB", +"S c #D3B5D468C38A", +"D c #D7CAD883C782", +"F c #DBBDDC52CCB1", +"G c #D31BD382D2B9", +"H c #DB51DB51DB51", +"J c #E169E1EFD1C5", +"K c #E37CE381E36D", +"L c #EDE9EDE9EDF9", +"P c #F3A8F3A6F3A6", +"I c #FFB4FFB4FFB4", +/* pixels */ +"IIILCmmmmmmmmxGIIIIIIIIIIIIIIIII", +"IIIk>222222222,CIIIIIIIIIIIIIIII", +"IIIdjNgggggggzp2GIIIIIIIIIIIIIII", +"IIIhfe66666666ey5tuuuuytttttrtGI", +"IIIhy6444444444qiyyyyyewq6542;8I", +"IIIdy4<<<<<<:&$$%========&%%%#5P", +"IIIde<;;;;;;$6ZSZNNNNMMMbvvvvp5P", +"IIIdw=#####@>DFDDDSSSSSSVBNNNl5L", +"IIIu>;>>>>>2MFvvvvvvvvvvvvvvvf5L", +"IIIw9FJJJJJJJnvvvvvvvvvvvvvvvf5L", +"IIIrNDBBBBBNbvvvvvvvvvvvvvvvva5L", +"IIItZncvvvvvvvvvvvvvvvvvvvvvva5L", +"IIItZnccccccccccccccccccccccca5L", +"IIItZbccccccccccccccccccccccca5L", +"IIItNbccccccccccccccccccccccca5L", +"IIIrMvllllllllllllllllllllllca5L", +"IIIrvvglllllllllllllllllllllla7L", +"IIIrjvggggggggggggggggggggggga7L", +"IIIrgcgggggggggggggggggggggggf7L", +"IIIrfcgggggggggggggggggggggggf8L", +"IIIrfcssssssssssssssssssssssgs8L", +"IIIrpgssssssssssssssssssssssss8L", +"IIIrpgsssssssssssssssssssssssg8L", +"IIIt9appppppppffffffpppppppppe8P", +"IIIKw000000000-.o+O>0000000000CI", +"IIIIIIIIIIIIII0*--+uIIIIIIIIIIII", +"IIIIIIIIIIILht*11-+-uAIIIIIIIIII", +"IIIIIKkutrr1177rrr087*8rrtuCLIII", +"IIIIIKAkhur*7thkkkkkh*7ruhCGKIII", +"IIIIIKACh07oO******** 170ukGLIII", +"IIIIIHu7331+X++++++++ -1137hKIII", +"IIIIIIPLLLLHurrrrrrrrkLLLLLPIIII" +}; only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/gnome-network-admin.install +++ gnome-system-tools-2.22.0/debian/gnome-network-admin.install @@ -0,0 +1,5 @@ +debian/pixmaps/network.xpm usr/share/gnome-system-tools/pixmaps/ +debian/tmp/usr/bin/network-admin +debian/tmp/usr/share/applications/network.desktop +debian/tmp/usr/share/gnome/help/network-admin +debian/tmp/usr/share/omf/network-admin only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/gnome-network-admin.menu +++ gnome-system-tools-2.22.0/debian/gnome-network-admin.menu @@ -0,0 +1,4 @@ +?package(gnome-network-admin):needs="X11" section="Applications/System/Administration"\ + hints="Network"\ + title="Network Admin" command="/usr/bin/network-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/network.xpm" only in patch2: unchanged: --- gnome-system-tools-2.22.0.orig/debian/gnome-system-tools.menu +++ gnome-system-tools-2.22.0/debian/gnome-system-tools.menu @@ -0,0 +1,20 @@ +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="Time"\ + title="Time Admin" command="/usr/bin/time-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/time.xpm" + +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="Network"\ + title="Shares Admin" command="/usr/bin/shares-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/shares.xpm" + +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="Users"\ + title="User accounts Admin" command="/usr/bin/users-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/users.xpm" + +?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\ + hints="RunLevel"\ + title="Services Admin" command="/usr/bin/services-admin"\ + icon="/usr/share/gnome-system-tools/pixmaps/services.xpm" +