SF.net SVN: geany:[3120] trunk

[eht16 at users.sourceforge.net]

Revision: 3120
          http://geany.svn.sourceforge.net/geany/?rev=3120&view=rev
Author:   eht16
Date:     2008-10-18 16:59:22 +0000 (Sat, 18 Oct 2008)

Log Message:
-----------
Require automake 1.7 or later.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/autogen.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-18 11:38:53 UTC (rev 3119)
+++ trunk/ChangeLog	2008-10-18 16:59:22 UTC (rev 3120)
@@ -9,6 +9,8 @@
    Update Scintilla to version 1.76.
  * src/highlighting.c, data/filetypes.diff:
    Add new style 'Changed' to filetype Diff.
+ * autogen.sh, Makefile.am:
+   Require automake 1.7 or later.
 
 
 2008-10-17  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-10-18 11:38:53 UTC (rev 3119)
+++ trunk/Makefile.am	2008-10-18 16:59:22 UTC (rev 3120)
@@ -2,6 +2,8 @@
 
 SUBDIRS = tagmanager scintilla src plugins icons po doc
 
+AUTOMAKE_OPTIONS =	1.7
+
 WIN32_BUILD_FILES = \
 	geany_private.rc \
     win32-config.h \

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2008-10-18 11:38:53 UTC (rev 3119)
+++ trunk/autogen.sh	2008-10-18 16:59:22 UTC (rev 3120)
@@ -36,7 +36,7 @@
 
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "**Error**: You must have \`automake' installed."
+	echo "**Error**: You must have \`automake' (1.7 or later) installed."
 	echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 	NO_AUTOMAKE=yes


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.