From 87117f5d9e33d5a6157f62287160585588e5e62a Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Mon, 19 Feb 2001 05:16:40 +0000
Subject: [PATCH] Fix nasty bug in configure.       STRTOL='strtoul.o' -->
 STRTOUL='strtoul.o'

---
 configure    | 8 ++++----
 configure.in | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index f5c01429bf..83d0eaf6e0 100755
--- a/configure
+++ b/configure
@@ -2641,7 +2641,7 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS"
 
 
 
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4999,7 +4999,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x={0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -5074,7 +5074,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} $ac_kw int foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -6329,7 +6329,7 @@ EOF
 
 else
   echo "$ac_t""no" 1>&6
-STRTOL='strtoul.o'
+STRTOUL='strtoul.o'
 fi
 
 
diff --git a/configure.in b/configure.in
index 063bb18564..194ff03e7d 100644
--- a/configure.in
+++ b/configure.in
@@ -865,7 +865,7 @@ AC_CHECK_FUNC(strtol,
 AC_SUBST(STRTOL)
 AC_CHECK_FUNC(strtoul,
 	      AC_DEFINE(HAVE_STRTOUL),
-	      STRTOL='strtoul.o')
+	      STRTOUL='strtoul.o')
 AC_SUBST(STRTOUL)
 AC_CHECK_FUNC(strcasecmp,
 	      AC_DEFINE(HAVE_STRCASECMP),