diff options
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.in | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/configure b/configure index 94f0917fc23..616b07b1645 100755 --- a/configure +++ b/configure @@ -17662,12 +17662,11 @@ done # Note 1: test -ef might not exist, but it's more reliable than `pwd`. # Note 2: /bin/pwd might be better than shell's built-in at getting # a symlink-free name. -if test "$no_create" != yes; then - if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then - : - else - vpath_build=yes - +if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then + vpath_build=no +else + vpath_build=yes + if test "$no_create" != yes; then echo $ECHO_N "preparing build tree... $ECHO_C" >&6 pgac_abs_top_srcdir=`cd "$srcdir" && pwd` $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \ @@ -17680,6 +17679,7 @@ echo "${ECHO_T}done" >&6 fi + ac_config_files="$ac_config_files GNUmakefile src/Makefile.global" diff --git a/configure.in b/configure.in index 6e4473c53b4..50cd8ebcbe2 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Header: /cvsroot/pgsql/configure.in,v 1.305 2003/11/24 19:08:01 petere Exp $ +dnl $Header: /cvsroot/pgsql/configure.in,v 1.306 2003/11/27 18:14:02 petere Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -1246,11 +1246,11 @@ AC_CHECK_PROGS(SGMLSPL, sgmlspl) # Note 1: test -ef might not exist, but it's more reliable than `pwd`. # Note 2: /bin/pwd might be better than shell's built-in at getting # a symlink-free name. -if test "$no_create" != yes; then - if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then - : - else - AC_SUBST(vpath_build, yes) +if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then + vpath_build=no +else + vpath_build=yes + if test "$no_create" != yes; then _AS_ECHO_N([preparing build tree... ]) pgac_abs_top_srcdir=`cd "$srcdir" && pwd` $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \ @@ -1258,6 +1258,7 @@ if test "$no_create" != yes; then AC_MSG_RESULT(done) fi fi +AC_SUBST(vpath_build) AC_CONFIG_FILES([GNUmakefile src/Makefile.global]) |