NetworkManager r3440 - trunk

[dcbw svn gnome org]

Author: dcbw
Date: Wed Mar 12 19:45:05 2008
New Revision: 3440
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3440&view=rev

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

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



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar 12 19:45:05 2008
@@ -14,14 +14,21 @@
 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])
+
+dnl maintainer mode stuff
+if test $USE_MAINTAINER_MODE = yes; then
+	DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED"
+else
+	DISABLE_DEPRECATED=""
+fi
+AC_SUBST(DISABLE_DEPRECATED)
 
 dnl
 dnl Required headers