[network-manager-openvpn] build: kill usage of gnome-common

[Dan Williams <dcbw src gnome org>]

commit 76e45436baad6276ab92e8d35526ce0c6fd0dc57
Author: Dan Williams <dcbw redhat com>
Date:   Mon Jul 13 10:05:08 2009 -0400

    build: kill usage of gnome-common

 autogen.sh             |   14 +++++++-------
 configure.ac           |   20 ++++++++++++++++++--
 properties/Makefile.am |    1 +
 3 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 91c332a..09aacca 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.9
 PKG_NAME=NetworkManager-openvpn
 
 (test -f $srcdir/configure.ac \
@@ -13,11 +13,11 @@ PKG_NAME=NetworkManager-openvpn
     exit 1
 }
 
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+(cd $srcdir;
+    autoreconf --install --symlink &&
+    intltoolize --force &&
+    autoreconf &&
+    ./configure --enable-maintainer-mode $@
+)
 
 
diff --git a/configure.ac b/configure.ac
index 0e11379..c07b933 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager-openvpn, 0.7.0, tim niemueller de, NetworkManager-openvpn)
-AM_INIT_AUTOMAKE([subdir-objects])
+AC_INIT(NetworkManager-openvpn, 0.7.995, dcbw redhat com, NetworkManager-openvpn)
+AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -36,6 +36,14 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
+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
 dnl GNOME support
 dnl
@@ -81,6 +89,14 @@ if test x"$with_gnome" != xno; then
 	PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
 	AC_SUBST(GNOMEKEYRING_CFLAGS)
 	AC_SUBST(GNOMEKEYRING_LIBS)
+
+	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)
 fi
 
 NM_COMPILER_WARNINGS
diff --git a/properties/Makefile.am b/properties/Makefile.am
index e949e00..875d2bd 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -19,6 +19,7 @@ libnm_openvpn_properties_la_CFLAGS =                    \
         $(LIBGNOMEUI_CFLAGS)                            \
         $(NETWORK_MANAGER_CFLAGS)                       \
         $(GNOMEKEYRING_CFLAGS)                          \
+        $(DISABLE_DEPRECATED)                           \
         -I$(top_srcdir)/                                \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DGLADEDIR=\""$(gladedir)"\"                    \