From 6c93fe8f9d6957cd8323e885f42d326629e6999b Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 30 Jul 1997 01:32:44 +0000
Subject: [PATCH] configure.in cleanup from sco install.
---
src/configure | 6 +++---
src/configure.in | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/configure b/src/configure
index b6d9dfc449c..46a882253b1 100755
--- a/src/configure
+++ b/src/configure
@@ -1021,7 +1021,7 @@ echo "$ac_t""$CPP" 1>&6
HAVECXX='HAVE_Cplusplus=false'
-for ac_prog in ginstall installbsd install bsdinst
+for ac_prog in ginstall installbsd bsdinst scoinst install
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1036,7 +1036,7 @@ else
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in NONE$ac_dummy; do
+ for ac_dir in $PATH$ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_INSTALL="$ac_dir/$ac_word"
@@ -1056,7 +1056,7 @@ fi
test -n "$INSTALL" && break
done
-test -n "$INSTALL" || INSTALL="scoinst"
+test -n "$INSTALL" || INSTALL="NONE"
if test $INSTALL = "NONE"
then
diff --git a/src/configure.in b/src/configure.in
index 660026dbfb2..428437dde54 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -259,7 +259,7 @@ dnl AC_SUBST(HAVECXX)
dnl ****************************************************************
HAVECXX='HAVE_Cplusplus=false'
AC_SUBST(HAVECXX)
-AC_PATH_PROGS(INSTALL, ginstall installbsd install bsdinst, scoinst, NONE, $PATH)
+AC_PATH_PROGS(INSTALL, ginstall installbsd bsdinst scoinst install, NONE, $PATH)
if test $INSTALL = "NONE"
then
echo "- No Install Script found - aborting."
--
GitLab