network-manager-applet r592 - in trunk: . src src/connection-editor src/vpn-properties

[dcbw svn gnome org]

Author: dcbw
Date: Wed Mar 12 19:56:45 2008
New Revision: 592
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=592&view=rev

Log:
2008-03-12  Dan Williams  <dcbw redhat com>

	* configure.ac
		- Bring in the bits of gnome-common we actually use (all 15 lines)

	* src/Makefile.am
	  src/connection-editor/Makefile.am
	  src/main.c
	  src/vpn-properties/Makefile.am
	  src/vpn-properties/nm-vpn-properties.c
		- s/GNOMELOCALEDIR/NMALOCALEDIR



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/connection-editor/Makefile.am
   trunk/src/main.c
   trunk/src/vpn-properties/Makefile.am
   trunk/src/vpn-properties/nm-vpn-properties.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Mar 12 19:56:45 2008
@@ -14,14 +14,20 @@
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-dnl
-dnl This doesn't depend on gnome support, only on gnome-common, autogen already
-dnl uses gnome-autogen
-dnl
-GNOME_COMMON_INIT
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+dnl ensure that when the Automake generated makefile calls aclocal,
+dnl it honours the $ACLOCAL_FLAGS environment variable
+ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+if test -n "$ac_macro_dir"; then
+    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+fi
+AC_SUBST([ACLOCAL_AMFLAGS])
+
+if test $USE_MAINTAINER_MODE = yes; then
+	DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+else
+	DISABLE_DEPRECATED=""
+fi
+AC_SUBST(DISABLE_DEPRECATED)
 
 dnl
 dnl Required headers

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Mar 12 19:56:45 2008
@@ -14,7 +14,7 @@
 	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\"			\
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"	\
 	-DDBUS_API_SUBJECT_TO_CHANGE							\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"					\
+	-DNMALOCALEDIR=\"$(datadir)/locale\"					\
 	$(DBUS_CFLAGS)										\
 	$(DISABLE_DEPRECATED)	\
 	-I${top_srcdir}/src/utils \

Modified: trunk/src/connection-editor/Makefile.am
==============================================================================
--- trunk/src/connection-editor/Makefile.am	(original)
+++ trunk/src/connection-editor/Makefile.am	Wed Mar 12 19:56:45 2008
@@ -8,7 +8,7 @@
 	-DGLADEDIR=\""$(gladedir)"\"		\
 	-DBINDIR=\""$(bindir)"\"		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"	\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	-DNMALOCALEDIR=\"$(datadir)/locale\"	\
 	$(DBUS_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
 	-I${top_srcdir}/src/gconf-helpers  \

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed Mar 12 19:56:45 2008
@@ -63,7 +63,7 @@
 {
 	NMApplet * applet;
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, NMALOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	gtk_init (&argc, &argv);
 	textdomain (GETTEXT_PACKAGE);

Modified: trunk/src/vpn-properties/Makefile.am
==============================================================================
--- trunk/src/vpn-properties/Makefile.am	(original)
+++ trunk/src/vpn-properties/Makefile.am	Wed Mar 12 19:56:45 2008
@@ -22,7 +22,7 @@
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DG_DISABLE_DEPRECATED \
 	-DGDK_DISABLE_DEPRECATED \
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+	-DNMALOCALEDIR=\"$(datadir)/locale\" \
 	-I${top_srcdir}/src/gconf-helpers  \
 	-DVERSION=\"$(VERSION)\"
 

Modified: trunk/src/vpn-properties/nm-vpn-properties.c
==============================================================================
--- trunk/src/vpn-properties/nm-vpn-properties.c	(original)
+++ trunk/src/vpn-properties/nm-vpn-properties.c	Wed Mar 12 19:56:45 2008
@@ -1271,7 +1271,7 @@
 		{ NULL }
 	};
 
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, NMALOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);