require automake 1.9

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10685 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 7783f6bfecf3d76ece064c5f582c08f83d17b580..7312135c619f4d64add0734a6896330575b6789d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-28  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * autogen.sh: require automake 1.9
+       * configure.ac: add 1.9 to automake options
+
 2005-12-23  Lars Gullik Bjonnes  <larsbj@lyx.org>
 
        * configure.ac: pre3

diff --git a/autogen.sh b/autogen.sh
index c94a14dc63c25910fb72b7595d3928e2fc2a8a01..be24ca23f24ac843a1fcc8be171f6e0a1c838dc6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,17 +12,17 @@ automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
 test "$automake_version" != "" && {
     echo "Using $automake_version"
 } || {
-    echo "LyX requires automake >= 1.5"
+    echo "LyX requires automake >= 1.9"
     exit 1
 }
 
 case $automake_version in
-    *' '1.[5-9]*)
+    *' '1.9*)
        ;;
     *)
     
        echo "This automake version is not supported by LyX."
-        echo "LyX only supports automake 1.[5-9]."
+        echo "LyX only supports automake 1.9."
         exit 1
         ;;
 esac

diff --git a/configure.ac b/configure.ac
index 9d1b05738322830476883f665df51f0f601e66b6..44e36a56e27506304174dadf032a6736383ee94d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ if test "${enable_maintainer_mode+set}" != set; then
 fi
 AM_MAINTAINER_MODE
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar 1.9])
 
 ### Set the execute permissions of the various scripts correctly
 for file in config/install-sh config/mkinstalldirs lib/configure ; do