|
@@ -3117,15 +3117,15 @@ detect_grfcodec() {
|
|
|
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 "904" ]; then
|
|
|
if [ -n "$version" ] && [ "$version" -lt "904" ]; then
|
|
|
log 1 "checking grfcodec... needs at least version 5.1.4 (r904), disabled"
|
|
|
if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
|
|
|
if [ -n "$version" ] && [ "$version" -lt "913" ]; then
|
|
|
log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
|
|
|
else
|
|
|
log 1 "checking grfcodec... not found"
|
|
|
fi
|
|
|
|
|
|
# It was forced, so it should be found.
|
|
|
if [ "$with_grfcodec" != "1" ]; then
|
|
@@ -3159,15 +3159,15 @@ detect_nforenum() {
|
|
|
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"
|
|
|
if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
|
|
|
if [ -n "$version" ] && [ "$version" -lt "913" ]; then
|
|
|
log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
|
|
|
else
|
|
|
log 1 "checking nforenum... not found"
|
|
|
fi
|
|
|
|
|
|
# It was forced, so it should be found.
|
|
|
if [ "$with_nforenum" != "1" ]; then
|