diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
| commit | 0603e2db00e773702906387620e5644c23360703 (patch) | |
| tree | a3f999ab9a8ac0ae015fedb9eb45a709a99c4a85 /c++/src/h5c++.in | |
| parent | 6e0e3da2837214179812cf613e78227d4cbb78b3 (diff) | |
| download | hdf5-0603e2db00e773702906387620e5644c23360703.zip hdf5-0603e2db00e773702906387620e5644c23360703.tar.gz hdf5-0603e2db00e773702906387620e5644c23360703.tar.bz2 | |
[svn-r7269] Purpose:
Update
Description:
Revamped the configuration system. The configurations for the Fortran
and C++ libraries are no longer separate from the "main"
configuration system. This involved removing the "configure*" and
"aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
merging settings in the config/ subdirectories into the main config/
subdirectory.
Fortran header files had to be modified a little for Linux. It was
checking if it was a Linux machine by some #defines, however with the
-std=c99 switch, these defines weren't there. I added a check for
some other ones which should be there whether the -std=c99 switch is
used or not.
Platforms tested:
Verbena (Fortran & C++)
Sol (Fortran & C++)
Copper (Fortran & C++)
Modi4 (Parallel, Fortran, & C++)
Misc. update:
Diffstat (limited to 'c++/src/h5c++.in')
| -rwxr-xr-x | c++/src/h5c++.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in index 29a1082..9d44f12 100755 --- a/c++/src/h5c++.in +++ b/c++/src/h5c++.in @@ -54,7 +54,6 @@ get_output_file="no" SHOW="eval" CXXBASE="@CXX@" CXXLINKERBASE="@CXX@" -CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@" CPPFLAGS="@CPPFLAGS@" LDFLAGS="@LDFLAGS@" @@ -213,7 +212,7 @@ if test "x$do_compile" = "xyes"; then compile_args="-c $compile_args" fi - $SHOW $CXX -I$includedir $CPPFLAGS $CXXFLAGS $CFLAGS $compile_args + $SHOW $CXX -I$includedir $CPPFLAGS $CXXFLAGS $compile_args status=$? if test "$status" != "0"; then @@ -223,7 +222,7 @@ fi if test "x$do_link" = "xyes"; then link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a $LIBS" - $SHOW $CXXLINKER -I$includedir $CPPFLAGS $CXXFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $link_args + $SHOW $CXXLINKER -I$includedir $CPPFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $link_args status=$? fi |