Remove configure maintainer mode.

It doesn't play nicely with git and multiple branches.

diff --git a/autogen.sh b/autogen.sh
index e93b5b1..3290f2e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -163,4 +163,4 @@ echo "  autoconf"
 autoconf || exit 1
 
 cd $olddir
-$srcdir/configure --enable-maintainer-mode "$@" && echo
+$srcdir/configure "$@" && echo

diff --git a/configure.ac b/configure.ac
index 9daa52c..3d875c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,6 @@ AC_INIT(src/flac/main.c)
 AM_INIT_AUTOMAKE(flac, 1.2.1)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-# Don't automagically regenerate autoconf/automake generated files unless
-# explicitly requested.  Eases autobuilding -mdz
-AM_MAINTAINER_MODE
-
 # Enable the generation of shared libraries under Win32
 AC_LIBTOOL_WIN32_DLL