From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 23 Oct 1998 02:49:17 +0000 (+0000)
Subject: Fix for version guessing in configure.
X-Git-Tag: REL6_4_2~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=759b17f0f6a60508f4bdddc16997d78eaa3d7755;p=thirdparty%2Fpostgresql.git

Fix for version guessing in configure.
---

diff --git a/src/configure.in b/src/configure.in
index 43fc773fd80..39d130de105 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -72,17 +72,26 @@ fi
 dnl this part selects the template from the one in the
 dnl template directory.
 
+dnl LOOK FOR EXACT MATCH FIRST,
+dnl then try an OS without a version
+
 AC_MSG_CHECKING(setting template to)
 AC_ARG_WITH(template,
     [  --with-template=TEMPLATE
                           use operating system template file 
                               see template directory],
     [  TEMPLATE=$withval ],
-    [  host_no_ver=`echo "$host" | sed 's/[[0-9.]]*$//'`
-       GUESS=`grep "$host_no_ver" template/.similar | sed 's/.*=//' | tail -1`
+    [  
+       GUESS=`grep "^$host=" template/.similar | sed 's/.*=//' | tail -1`
        if test "$GUESS"
-       then	TEMPLATE="$GUESS"
-       else	TEMPLATE=`uname -s | tr A-Z a-z` 
+       then TEMPLATE="$GUESS"
+       else
+           host_no_ver=`echo "$host" | sed 's/[[0-9.]]*$//'`
+           GUESS=`grep "^$host_no_ver" template/.similar | sed 's/.*=//' | tail -1`
+           if test "$GUESS"
+           then	TEMPLATE="$GUESS"
+           else	TEMPLATE=`uname -s | tr A-Z a-z` 
+           fi
        fi
     ])
 AC_MSG_RESULT($TEMPLATE)