From a317d59a986b9744540b9031f9e539ea59cf75fb Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 18 Jun 2004 17:11:10 +0000
Subject: [PATCH] Fixed a bug in minor version extractor. Wrapped GEOS_VERSION
 in an #ifndef block. More runtime checks.

git-svn-id: http://svn.osgeo.org/postgis/trunk@634 b70326c6-7e19-0410-871a-916f4a2858ee
---
 geos_version.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/geos_version.sh b/geos_version.sh
index 730c226f1..6fa95383d 100755
--- a/geos_version.sh
+++ b/geos_version.sh
@@ -1,20 +1,27 @@
 #!/bin/sh
 
 if [ -z "$1" ]; then
-	echo "Usage `basename $0` <geosdir>" >&2
+	echo "Usage: `basename $0` <geosdir>" >&2
 	exit 1
 fi
 
 geos_dir=$1
 version=`${geos_dir}/bin/geos-config --version`
+if [ $? -ne 0 ]; then
+	exit 1
+fi
+
 if [ "$version" = "@GEOS_VERSION@" ]; then
 	geos_version=100
+	version="1.0.0"
 else
 	major=`echo $version | sed 's/\..*//'`
-	minor=`echo $version | sed 's/.*\.\([^.]*\)\.*/\1/'`
+	minor=`echo $version | sed 's/[^\.]*\.\([^.]*\)\.*/\1/'`
 	geos_version=`printf %d%2.2d $major $minor`
 fi
 cat <<EOF
 #define POSTGIS_GEOS_VERSION $geos_version
-#define GEOS_VERSION $version
+#ifndef GEOS_VERSION
+#define GEOS_VERSION "$version"
+#endif
 EOF
-- 
2.40.0