[network-manager-vpnc/NETWORKMANAGER_0_7] build: fix missed bits of killing gnome-common



commit d570d8cba50ea63b667800dec39f2f9a5203014a
Author: Dan Williams <dcbw redhat com>
Date:   Fri Aug 28 16:43:28 2009 -0500

    build: fix missed bits of killing gnome-common

 configure.ac |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 77cbe18..b571734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,14 @@ dnl
 AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-vpnc without GNOME support, e.g. vpn service only]))
 AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
 
+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])
+
 GETTEXT_PACKAGE=NetworkManager-vpnc
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]