From f75dd6fd1975146623052b843b182dc32c3fbe46 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 8 Apr 2011 07:30:59 +0200
Subject: Imported Upstream version 0.8.998

---
 Makefile.am | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 64be5c85..adb2907b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
 SUBDIRS = \
 	marshallers \
+	include \
 	libnm-util \
 	libnm-glib \
-	src \
-	include \
 	introspection \
+	src \
 	callouts \
-	system-settings \
 	cli \
 	tools \
 	policy \
@@ -29,11 +28,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-tests=yes \
 	--with-docs=yes \
 	--with-udev-dir=$$dc_install_base/lib/udev \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
+	--enable-wimax=no
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
-- 
cgit 1.3.0-6-gf8a5