summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2000-10-18 16:46:00 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2000-10-18 16:46:00 (GMT)
commit8f6dc0bc88a79a52e1e23b02e2a96b10ef5a5a44 (patch)
treec71058a242c93cbe261e0657a1522a12da419782
parent29c5ab73e4bb9ffc281f73325551228aed74522c (diff)
downloadhdf5-8f6dc0bc88a79a52e1e23b02e2a96b10ef5a5a44.zip
hdf5-8f6dc0bc88a79a52e1e23b02e2a96b10ef5a5a44.tar.gz
hdf5-8f6dc0bc88a79a52e1e23b02e2a96b10ef5a5a44.tar.bz2
[svn-r2695] Purpose:
Buglet Fix...kinda Description: The --enable-c++ flag is in there, but configure can't handle the ++ on the end. Solution: Changed it to --enable-cxx instead. N.B. This feature isn't really needed yet since C++ isn't integrated with the library proper. Platforms tested: Linux
-rwxr-xr-xconfigure11
-rw-r--r--configure.in6
2 files changed, 9 insertions, 8 deletions
diff --git a/configure b/configure
index 5f7d0d1..d2e7e7c 100755
--- a/configure
+++ b/configure
@@ -114,7 +114,7 @@ ac_default_prefix=/usr/local
ac_help="$ac_help
--enable-fortran Compile the Fortran interface [default=no]"
ac_help="$ac_help
- --enable-c++ Compile the C++ interface [default=no]"
+ --enable-cxx Compile the C++ interface [default=no]"
ac_help="$ac_help
--enable-static-exec Build only statically linked executables [default=no]"
ac_help="$ac_help
@@ -1037,7 +1037,7 @@ fi
CC_BASENAME="`echo $CC |cut -f1 -d' ' | xargs basename 2>/dev/null`"
-config_dirs=""
+ config_dirs=""
echo $ac_n "checking if fortran interface enabled""... $ac_c" 1>&6
echo "configure:1044: checking if fortran interface enabled" >&5
@@ -1061,9 +1061,9 @@ fi
echo $ac_n "checking if c++ interface enabled""... $ac_c" 1>&6
echo "configure:1064: checking if c++ interface enabled" >&5
-# Check whether --enable-c++ or --disable-c++ was given.
-if test "${enable_c+++set}" = set; then
- enableval="$enable_c++"
+# Check whether --enable-cxx or --disable-cxx was given.
+if test "${enable_cxx+set}" = set; then
+ enableval="$enable_cxx"
HDF_CXX=$enableval
fi
@@ -9527,6 +9527,7 @@ s%@host_cpu@%$host_cpu%g
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@CC@%$CC%g
+s%@config_dirs@%$config_dirs%g
s%@subdirs@%$subdirs%g
s%@LT_STATIC_EXEC@%$LT_STATIC_EXEC%g
s%@AR@%$AR%g
diff --git a/configure.in b/configure.in
index d548313..970d80e 100644
--- a/configure.in
+++ b/configure.in
@@ -133,7 +133,7 @@ dnl
AC_PROG_CC
CC_BASENAME="`echo $CC |cut -f1 -d' ' | xargs basename 2>/dev/null`"
-config_dirs=""
+AC_SUBST(config_dirs) config_dirs=""
dnl ----------------------------------------------------------------------
dnl Check if they would like the Fortran interface compiled
@@ -158,8 +158,8 @@ dnl ----------------------------------------------------------------------
dnl Check if they would like the Fortran interface compiled
dnl
AC_MSG_CHECKING(if c++ interface enabled)
-AC_ARG_ENABLE(c++,
- [ --enable-c++ Compile the C++ interface [default=no]],
+AC_ARG_ENABLE(cxx,
+ [ --enable-cxx Compile the C++ interface [default=no]],
HDF_CXX=$enableval)
if test "X$HDF_CXX" = "Xyes"; then