[sapwood] some build improvements

[Sven Herzberg <herzi src gnome org>]

commit edb781984df93179e3771f570371a7c5a9f9506d
Author: Sven Herzberg <herzi gnome-de org>
Date:   Tue Jun 22 10:56:20 2010 +0200

    some build improvements
    
    * autogen.sh: try the common name before the other one
    * configure.in: drop the maintainer mode stuff, without this macro,
      proper rebuilding is always enabled

 autogen.sh   |    4 ++--
 configure.in |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index ae05935..accf354 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,10 +2,10 @@
 
 set -x
 libtoolize --automake
-aclocal-1.8 || aclocal
+aclocal || aclocal-1.8
 autoconf
 autoheader
-automake-1.8 --add-missing --foreign || automake --add-missing --foreign
+automake --add-missing --foreign || automake-1.8 --add-missing --foreign
 
 if test x$NOCONFIGURE = x; then
   ./configure --enable-maintainer-mode --enable-debug "$@"
diff --git a/configure.in b/configure.in
index 8195703..38e3f66 100644
--- a/configure.in
+++ b/configure.in
@@ -4,9 +4,6 @@ AM_INIT_AUTOMAKE(sapwood, 3.1.1)
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
 # Save ACLOCAL_FLAGS
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"