Commitb07f4b4

committed

Configure fix for install script search.

1 parent82707ff commitb07f4b4Copy full SHA for b07f4b4

File tree

+25

-7

lines changed

+25

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1352,6 +1352,7 @@ fi`
`1352`	`1352`
`1353`	`1353`
`1354`	`1354`
	`1355`	`+set -x`
`1355`	`1356`	`forac_progin ginstall installbsd bsdinst scoinst install install-sh`
`1356`	`1357`	`do`
`1357`	`1358`	`# Extract the first word of "$ac_prog", so it can be a program name with args.`
`@@ -1389,7 +1390,7 @@ test -n "$INSTALL" && break`
`1389`	`1390`	`done`
`1390`	`1391`	`test -n"$INSTALL"\|\| INSTALL="NONE"`
`1391`	`1392`
`1392`		`-iftest$INSTALL ="NONE"`
	`1393`	`+iftest"$INSTALL" ="NONE"`
`1393`	`1394`	`then`
`1394`	`1395`	`echo"- No Install Script found - aborting."`
`1395`	`1396`	`exit 0;`

Lines changed: 18 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -354,11 +354,26 @@ AC_ARG_WITH(CXX,`
`354`	`354`	`[ AC_PROG_CXX])`
`355`	`355`	`AC_SUBST(HAVECXX)`
`356`	`356`
`357`		-AC_PATH_PROGS(INSTALL, ginstall installbsd bsdinst scoinst install install-sh, NONE, "/usr/ucb:$PATH:`pwd`")
`358`		`-if test $INSTALL = "NONE"`
	`357`	+AC_PATH_PROGS(INSTALL, ginstall, NONE, "/usr/ucb:$PATH:`pwd`")
	`358`	`+if test "$INSTALL" = "NONE"`
	`359`	+AC_PATH_PROGS(INSTALL, installbsd, NONE, "/usr/ucb:$PATH:`pwd`")
	`360`	`+fi`
	`361`	`+if test "$INSTALL" = "NONE"`
	`362`	+AC_PATH_PROGS(INSTALL, bsdinst, NONE, "/usr/ucb:$PATH:`pwd`")
	`363`	`+fi`
	`364`	`+if test "$INSTALL" = "NONE"`
	`365`	+AC_PATH_PROGS(INSTALL, scoinst, NONE, "/usr/ucb:$PATH:`pwd`")
	`366`	`+fi`
	`367`	`+if test "$INSTALL" = "NONE"`
	`368`	+AC_PATH_PROGS(INSTALL, install, NONE, "/usr/ucb:$PATH:`pwd`")
	`369`	`+fi`
	`370`	`+if test "$INSTALL" = "NONE"`
	`371`	+AC_PATH_PROGS(INSTALL, install-sh, NONE, "/usr/ucb:$PATH:`pwd`")
	`372`	`+fi`
	`373`	`+if test "$INSTALL" = "NONE"`
`359`	`374`	`then`
`360`	`375`	`echo "- No Install Script found - aborting."`
`361`		`-exit 0;`
	`376`	`+exit 0`
`362`	`377`	`fi`
`363`	`378`
`364`	`379`	`INSTLOPTS="-m 444"`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 1 deletion

Lines changed: 2 additions & 1 deletion

Comments

(0)