Commit859accd

committed

Make sure vpath_build is set correctly even if config.status --no-create

was specified.

1 parentc9190ef commit859accdCopy full SHA for 859accd

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -17662,12 +17662,11 @@ done`
`17662`	`17662`	# Note 1: test -ef might not exist, but it's more reliable than `pwd`.
`17663`	`17663`	`# Note 2: /bin/pwd might be better than shell's built-in at getting`
`17664`	`17664`	`# a symlink-free name.`
`17665`		`-if test "$no_create" != yes; then`
`17666`		- if ( test "$srcdir" -ef . ) >/dev/null 2>&1 \|\| test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
`17667`		`- :`
`17668`		`- else`
`17669`		`- vpath_build=yes`
`17670`		`-`
	`17665`	+if ( test "$srcdir" -ef . ) >/dev/null 2>&1 \|\| test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
	`17666`	`+ vpath_build=no`
	`17667`	`+else`
	`17668`	`+ vpath_build=yes`
	`17669`	`+ if test "$no_create" != yes; then`
`17671`	`17670`	`echo $ECHO_N "preparing build tree... $ECHO_C" >&6`
`17672`	`17671`	pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
`17673`	`17672`	`$SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \`
`@@ -17680,6 +17679,7 @@ echo "${ECHO_T}done" >&6`
`17680`	`17679`	`fi`
`17681`	`17680`
`17682`	`17681`
	`17682`	`+`
`17683`	`17683`	`ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"`
`17684`	`17684`
`17685`	`17685`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $Header: /cvsroot/pgsql/configure.in,v 1.305 2003/11/24 19:08:01 petere Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.306 2003/11/27 18:14:02 petere Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1246,18 +1246,19 @@ AC_CHECK_PROGS(SGMLSPL, sgmlspl)`
`1246`	`1246`	# Note 1: test -ef might not exist, but it's more reliable than `pwd`.
`1247`	`1247`	`# Note 2: /bin/pwd might be better than shell's built-in at getting`
`1248`	`1248`	`# a symlink-free name.`
`1249`		`-if test "$no_create" != yes; then`
`1250`		-if ( test "$srcdir" -ef . ) >/dev/null 2>&1 \|\| test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
`1251`		`- :`
`1252`		`-else`
`1253`		`- AC_SUBST(vpath_build,yes)`
	`1249`	+if(test "$srcdir" -ef . ) >/dev/null 2>&1 \|\| test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
	`1250`	`+vpath_build=no`
	`1251`	`+else`
	`1252`	`+vpath_build=yes`
	`1253`	`+if test "$no_create" !=yes; then`
`1254`	`1254`	`_AS_ECHO_N([preparing build tree... ])`
`1255`	`1255`	pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
`1256`	`1256`	`$SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \`
`1257`	`1257`	`\|\| AC_MSG_ERROR(failed)`
`1258`	`1258`	`AC_MSG_RESULT(done)`
`1259`	`1259`	`fi`
`1260`	`1260`	`fi`
	`1261`	`+AC_SUBST(vpath_build)`
`1261`	`1262`
`1262`	`1263`
`1263`	`1264`	`AC_CONFIG_FILES([GNUmakefile src/Makefile.global])`

Comments

(0)