Updated REQUIRED_AUTOMAKE_VERSION from 1.4 to 1.5 since it no longer

2005-06-20  Brian Cameron  <brian.cameron@sun.com>

        * autogen.sh: Updated REQUIRED_AUTOMAKE_VERSION
          from 1.4 to 1.5 since it no longer requires 1.4
          and gnome-autogen.sh would complain if you had
          a newer version of automake.  Fixes bug
          #307543.

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 78ded00d..95ddac7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-20  Brian Cameron  <brian.cameron@sun.com>
 
+	* autogen.sh: Updated REQUIRED_AUTOMAKE_VERSION
+	  from 1.4 to 1.5 since it no longer requires 1.4
+	  and gnome-autogen.sh would complain if you had
+	  a newer version of automake.  Fixes bug 
+	  #307543.
+
 	* daemon/slave.c: On 04/25, a change was made
 	  to move seteuid/setegid to before checking
 	  the existance of the user's $HOME id to fix
diff --git a/autogen.sh b/autogen.sh
index 512c8ca3..3307de7c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+REQUIRED_AUTOMAKE_VERSION=1.5
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
@@ -24,4 +26,5 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+#USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. gnome-autogen.sh