From 72466fe79b8a3f1aa0fc0e70e6fce6e9dccc8f53 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Thu, 24 Jun 2004 11:12:53 +0000
Subject: [PATCH] Clifford Wolf: 	Updated csync2-1.14 	Fixed $autogen
 for new configure.ac files

[2004061412515720675] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3361 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/clifford/csync2/csync2.desc | 7 +++++--
 scripts/functions                   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/clifford/csync2/csync2.desc b/package/clifford/csync2/csync2.desc
index 76039c9b3..30f696b6e 100644
--- a/package/clifford/csync2/csync2.desc
+++ b/package/clifford/csync2/csync2.desc
@@ -36,8 +36,11 @@
 
 [L] GPL
 [S] Stable
-[V] 1.7
+[V] 1.14
 [P] X -----5---9 209.200
 
-[D] 953731508 csync2-1.7.tar.gz http://oss.linbit.com/csync2/
+[D] 1821558868 csync2-1.14.tar.gz http://oss.linbit.com/csync2/
+
+# Needed because otherwise Makefile want's to re-run aclocal-1.6..
+[CONF] autogen=1
 
diff --git a/scripts/functions b/scripts/functions
index 8bfb10141..74fbd2dce 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -213,7 +213,7 @@ function eval_config_command() {
 			ln -sf /usr/share/automake/$x .
 		fi
 	done
-	if [ $autogen -eq 1 -a -f configure.in ] ; then
+	if [ $autogen -eq 1 -a \( -f configure.in -o -f configure.ac \) ] ; then
 		if [ -f configure.orig ] ; then
 			echo "Found configure.orig. Not" \
 			     "running autogen script."
@@ -223,7 +223,7 @@ function eval_config_command() {
 		else
 			echo "Running builtin autogen script."
 			libtoolize --force --automake ; aclocal
-			if grep AM_INIT_AUTOMAKE configure.in
+			if grep AM_INIT_AUTOMAKE configure.[ia][nc]
 				then automake ; fi
 			autoconf
 		fi