[gnome-network] Request for gnome-nettool freeze break (1)

[Germán Poó Caamaño <gpoo ubiobio cl>]

By mistake a made differents commits.  So, before to revert them
I'd ask for approval to release-team.  Please, accept my apologies
for that stupid mistake.

To make them clear, I divided the patches in differents emails.
So here I go with the first one.

It just fixes the build in order to:
- Use automake 1.7 and pass make distcheck.
- Delete 'ifconfig' checker, that produce confuse and it's not
  used from a while.

It's suppossed that build fixes doesn't require approval, but 
because of the big mistake I prefer to ask it.

-- 
Germán Poó Caamaño
http://www.ubiobio.cl/~gpoo/

Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/gnome-nettool/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.sh	23 Jan 2004 23:41:44 -0000	1.2
+++ autogen.sh	10 Sep 2004 02:56:38 -0000	1.3
@@ -5,16 +5,11 @@
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gnome-netinfo"
+REQUIRED_AUTOMAKE_VERSION=1.7
 
-(test -f $srcdir/configure.in \
-  && test -d $srcdir/src \
-  && test -f $srcdir/src/ping.c) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
+if [ ! -f "$srcdir/src/nettool.c" ]; then
+	echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
+	exit 1
+fi
 
-gnome_autogen=`which gnome-autogen.sh`
-test -z "$gnome_autogen"
-
-USE_GNOME2_MACROS=1 . $gnome_autogen
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-nettool/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure.in	8 Sep 2004 20:23:52 -0000	1.22
+++ configure.in	10 Sep 2004 03:26:30 -0000	1.23
@@ -39,21 +39,6 @@
 AC_SUBST(NETTOOL_CFLAGS)
 AC_SUBST(NETTOOL_LIBS)
 
-dnl Find ifconfig
-dnl
-AC_ARG_WITH(ifconfig, [  --with-ifconfig=PATH    Where ifconfig is.])
-if test "x$with_ifconfig" = "x" ; then
-	AC_PATH_PROG(IFCONFIG_PROGRAM, 
-		ifconfig,,
-		$PATH:/sbin:/usr/etc:/usr/sbin)
-	if test "x$IFCONFIG_PROGRAM" != "x" ; then
-		AC_DEFINE_UNQUOTED(IFCONFIG_PROGRAM, "$IFCONFIG_PROGRAM", [The ifconfig program])
-	fi
-else
-	AC_DEFINE_UNQUOTED(IFCONFIG_PROGRAM, "$with_ifconfig", [The ifconfig program])
-fi
-AM_CONDITIONAL(HAVE_IFCONFIG, test "x$IFCONFIG_PROGRAM" != "x")
-
 dnl
 dnl Translations
 dnl
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-nettool/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	18 Aug 2004 20:29:04 -0000	1.4
+++ Makefile.am	10 Sep 2004 02:56:38 -0000	1.5
@@ -5,3 +5,8 @@
 	intltool-merge.in \
 	intltool-update.in \
 	mkinstalldirs
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-nettool/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/Makefile.am	18 Aug 2004 20:47:32 -0000	1.7
+++ src/Makefile.am	10 Sep 2004 02:56:38 -0000	1.8
@@ -35,6 +35,8 @@
 	gnome-nettool.desktop.in \
 	$(dialog_DATA)
 
+DISTCLEANFILES = gnome-nettool.desktop
+
 Applicationsdir = $(datadir)/applications
 Applications_in_files = gnome-nettool.desktop.in
 Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/gnome-nettool/src/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/main.c	6 Jul 2004 17:41:13 -0000	1.11
+++ src/main.c	10 Sep 2004 03:26:30 -0000	1.12
@@ -572,9 +572,6 @@
 	label1 = glade_xml_get_widget (xml, "info_combo_label");
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label1), info->combo);
 
-/*
-#ifdef IFCONFIG_PROGRAM
-*/
 	model = GTK_TREE_MODEL (gtk_list_store_new (3, GDK_TYPE_PIXBUF,
 						    G_TYPE_STRING,
 						    G_TYPE_POINTER));
@@ -591,11 +588,6 @@
 			  info);
 	
 	info_load_iface (info);
-/*
-#else
-	gtk_widget_set_sensitive (vbox_info, FALSE);
-#endif
-*/
 	info->copy_output = NETINFO_COPY_FUNC (info_copy_to_clipboard);
 
 	return info;
Index: src/callbacks.c
===================================================================
RCS file: /cvs/gnome/gnome-nettool/src/callbacks.c,v
retrieving revision 1.13
retrieving revision 1.15
diff -u -r1.13 -r1.15
--- src/callbacks.c	23 Aug 2004 16:01:43 -0000	1.13
+++ src/callbacks.c	10 Sep 2004 04:26:12 -0000	1.15
@@ -111,24 +111,6 @@
 }
 
 /* Info callbacks */
-#ifdef IFCONFIG_PROGRAM
-/*void
-on_info_nic_changed (GtkEntry * entry, gpointer info)
-{
-	gchar *nic;
-
-	g_return_if_fail (info != NULL);
-
-	nic = g_strdup (gtk_entry_get_text (entry));
-
-	if (strlen (nic) > 0) {
-		info_do (nic, (Netinfo *) & info);
-	}
-
-	g_free (nic);
-}*/
-#endif
-
 void
 on_configure_button_clicked (GtkButton *button, gpointer data)
 {