cpp/openttd-patchpack/source Changeset - r19086:cf77bf636a75

Changeset - r19086:cf77bf636a75

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

michi_cc - 13 years ago 2012-02-15 21:39:10
michi_cc@openttd.org

(svn r23954) -Fix (r23952): Update required grfcodec version.

1 file changed with 3 insertions and 3 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -3075,99 +3075,99 @@ detect_sort() { @@
 		if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi
 		if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi
 	else
 		_detect_sort "$with_sort"
 	fi
 	if [ -z "$sort" ]; then
 		if [ "$with_sort" = "2" ]; then
 			log 1 "checking sort... not found"
 			log 1 "configure: error: couldn't detect sort on your system"
 			exit 1
 		elif [ "$with_sort" != "1" ]; then
 			log 1 "checking sort... $with_sort not found"
 			log 1 "configure: error: '$with_sort' doesn't look like a sort to me"
 			log 1 "configure: error: please verify its location and function and try again"
 			exit 1
 		else
 			log 1 "checking sort... not found"
 		fi
 	else
 		log 1 "checking sort... $sort"
 	fi
+}
 detect_grfcodec() {
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$with_grfcodec" = "0" ]; then
 		log 1 "checking grfcodec... disabled"
 		grfcodec=""
 		return 0
 	fi
 	if [ "$with_grfcodec" = "1" ] || [ "$with_grfcodec" = "" ] || [ "$with_grfcodec" = "2" ]; then
 		grfcodec="grfcodec"
 	else
 		grfcodec="$with_grfcodec"
 	fi
 	version=`$grfcodec -v 2>/dev/null | $awk '{print $3}' | sed 's/[rM]//g;s/-/0/'`
 	ret=$?
 	log 2 "executing grfcodec -v"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
 		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
 			log 1 "checking grfcodec... needs at least version 5.1.3 (r846), disabled"
 	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "897" ]; then
 		if [ -n "$version" ] && [ "$version" -lt "897" ]; then
 			log 1 "checking grfcodec... needs at least version 5.1.4 (r897), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
 		# It was forced, so it should be found.
 		if [ "$with_grfcodec" != "1" ]; then
 			log 1 "configure: error: grfcodec couldn't be found"
 			log 1 "configure: error: you supplied '$with_grfcodec', but it seems invalid"
 			exit 1
 		fi
 		grfcodec=""
 		return 0
 	fi
 	log 1 "checking grfcodec... found"
+}
 detect_nforenum() {
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$with_nforenum" = "0" ]; then
 		log 1 "checking nforenum... disabled"
 		nforenum=""
 		return 0
 	fi
 	if [ "$with_nforenum" = "1" ] || [ "$with_nforenum" = "" ] || [ "$with_nforenum" = "2" ]; then
 		nforenum="nforenum"
 	else
 		nforenum="$with_nforenum"
 	fi
 	version=`$nforenum -v 2>/dev/null | $awk '{print $3}' | sed 's/[rM]//g;s/-/0/'`
 	ret=$?
 	log 2 "executing nforenum -v"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
 		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
 			log 1 "checking nforenum... needs at least version 5.1.3 (r846), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
 		# It was forced, so it should be found.
 		if [ "$with_nforenum" != "1" ]; then

0 comments (0 inline, 0 general)