From b07f4b4efb1eb9873f493613ed3c7ab69bf51b78 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 2 Sep 1998 01:54:18 +0000
Subject: [PATCH] Configure fix for install script search.

---
 src/configure         |  3 ++-
 src/configure.in      | 21 ++++++++++++++++++---
 src/template/bsdi_2.0 |  2 +-
 src/template/bsdi_2.1 |  3 ++-
 src/template/bsdi_3.0 |  3 ++-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/configure b/src/configure
index f2ecdf522c..ee6177ddcb 100755
--- a/src/configure
+++ b/src/configure
@@ -1352,6 +1352,7 @@ fi
 
 
 
+set -x
 for ac_prog in ginstall installbsd bsdinst scoinst install install-sh
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -1389,7 +1390,7 @@ test -n "$INSTALL" && break
 done
 test -n "$INSTALL" || INSTALL="NONE"
 
-if test $INSTALL = "NONE"
+if test "$INSTALL" = "NONE"
 then
 	echo "- No Install Script found - aborting."
 	exit 0;
diff --git a/src/configure.in b/src/configure.in
index 88035b17cc..0782ea83a1 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -354,11 +354,26 @@ AC_ARG_WITH(CXX,
     [   AC_PROG_CXX])
 AC_SUBST(HAVECXX)
 
-AC_PATH_PROGS(INSTALL, ginstall installbsd bsdinst scoinst install install-sh, NONE, "/usr/ucb:$PATH:`pwd`")
-if test $INSTALL = "NONE"
+AC_PATH_PROGS(INSTALL, ginstall, NONE, "/usr/ucb:$PATH:`pwd`")
+if test "$INSTALL" = "NONE"
+AC_PATH_PROGS(INSTALL, installbsd, NONE, "/usr/ucb:$PATH:`pwd`")
+fi
+if test "$INSTALL" = "NONE"
+AC_PATH_PROGS(INSTALL, bsdinst, NONE, "/usr/ucb:$PATH:`pwd`")
+fi
+if test "$INSTALL" = "NONE"
+AC_PATH_PROGS(INSTALL, scoinst, NONE, "/usr/ucb:$PATH:`pwd`")
+fi
+if test "$INSTALL" = "NONE"
+AC_PATH_PROGS(INSTALL, install, NONE, "/usr/ucb:$PATH:`pwd`")
+fi
+if test "$INSTALL" = "NONE"
+AC_PATH_PROGS(INSTALL, install-sh, NONE, "/usr/ucb:$PATH:`pwd`")
+fi
+if test "$INSTALL" = "NONE"
 then
 	echo "- No Install Script found - aborting."
-	exit 0;
+	exit 0
 fi
 
 INSTLOPTS="-m 444"
diff --git a/src/template/bsdi_2.0 b/src/template/bsdi_2.0
index b31c5741c5..077e9f9736 100644
--- a/src/template/bsdi_2.0
+++ b/src/template/bsdi_2.0
@@ -1,5 +1,4 @@
 AROPT:cq
-CC:gcc2
 CFLAGS:-O2 -m486 -pipe -DPRE_BSDI_2_1
 SHARED_LIB:
 ALL:
@@ -9,3 +8,4 @@ USE_LOCALE:no
 DLSUFFIX:.o
 YFLAGS:-d
 YACC:
+CC:gcc2
diff --git a/src/template/bsdi_2.1 b/src/template/bsdi_2.1
index 83d232c7a4..2a6788e087 100644
--- a/src/template/bsdi_2.1
+++ b/src/template/bsdi_2.1
@@ -1,5 +1,4 @@
 AROPT:cq
-CC:gcc2
 CFLAGS:-O2 -m486 -pipe
 SHARED_LIB:
 ALL:
@@ -9,3 +8,5 @@ USE_LOCALE:no
 DLSUFFIX:.o
 YFLAGS:-d
 YACC:
+CC:gcc2
+
diff --git a/src/template/bsdi_3.0 b/src/template/bsdi_3.0
index 83d232c7a4..2a6788e087 100644
--- a/src/template/bsdi_3.0
+++ b/src/template/bsdi_3.0
@@ -1,5 +1,4 @@
 AROPT:cq
-CC:gcc2
 CFLAGS:-O2 -m486 -pipe
 SHARED_LIB:
 ALL:
@@ -9,3 +8,5 @@ USE_LOCALE:no
 DLSUFFIX:.o
 YFLAGS:-d
 YACC:
+CC:gcc2
+
-- 
2.40.0