summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2003-12-02 03:47:02 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2003-12-02 03:47:02 (GMT)
commit63e25416266ac339312fd8d1b1ca1e2c14256650 (patch)
treed223446c1c5be9988676e55287eb5dfd9db6d95f
parent3ac28525eefb8ba275ff25340f059110687affb0 (diff)
downloadhdf5-63e25416266ac339312fd8d1b1ca1e2c14256650.zip
hdf5-63e25416266ac339312fd8d1b1ca1e2c14256650.tar.gz
hdf5-63e25416266ac339312fd8d1b1ca1e2c14256650.tar.bz2
[svn-r7903] Change --prefix default to `pwd`/hdf5, a directory in the build
directory. This eliminates the problem that the builder may not have permission to install in the default install directory. It also allows multiple builds in the same host or multiple srcdir using the same source. Platforms tested: Eirene plus eyeballing of changes. Misc. update:
-rwxr-xr-xconfigure11
-rw-r--r--configure.in5
-rw-r--r--release_docs/RELEASE.txt3
3 files changed, 15 insertions, 4 deletions
diff --git a/configure b/configure
index 055951c..6e859cc 100755
--- a/configure
+++ b/configure
@@ -421,6 +421,7 @@ PACKAGE_STRING='HDF5 1.6.1-post4'
PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu'
ac_unique_file="src/H5.c"
+ac_default_prefix=`pwd`/hdf5
ac_subdirs_all="$ac_subdirs_all ${config_dirs}"
# Factoring default headers for most tests.
ac_includes_default="\
@@ -1509,6 +1510,8 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
echo "$as_me:$LINENO: checking shell variables initial values" >&5
echo $ECHO_N "checking shell variables initial values... $ECHO_C" >&6
set >&5
@@ -4149,7 +4152,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4152 "configure"' > conftest.$ac_ext
+ echo '#line 4155 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4690,7 +4693,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:4693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -6497,7 +6500,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 6500 "configure"
+#line 6503 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -6595,7 +6598,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 6598 "configure"
+#line 6601 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/configure.in b/configure.in
index 607f4fd..9895f77 100644
--- a/configure.in
+++ b/configure.in
@@ -48,6 +48,11 @@ AC_CANONICAL_HOST
AC_SUBST([CPPFLAGS])
dnl ----------------------------------------------------------------------
+dnl Set prefix default (install directory) to a directory in the build area.
+dnl This allows multiple src-dir builds within one host.
+AC_PREFIX_DEFAULT([`pwd`/hdf5])
+
+dnl ----------------------------------------------------------------------
dnl Dump all shell variables values.
dnl
AC_MSG_CHECKING([shell variables initial values])
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 8d1d717..af1f84c 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -37,6 +37,9 @@ New Features
Configuration:
--------------
+ - Default of $prefix is changed to $PWD/hdf5 so that multiple
+ builds using --srcdir is possible in the same machine.
+ AKC - 2003/12/1
Library:
--------