[svn-r11419] Purpose:

Feature

Description:
Created H5_CFLAGS, H5_CPPFLAGS, H5_CXXFLAGS, and H5_FFLAGS variables.
These hold flags that are used to build hdf5, but won't be passed on to
h5cc (or h5fc, or h5c++).
Currently there are no flags included; this is just the framework for such
flags.

Platforms tested:
mir, modi4, sleipnir


Misc. update:

9 files changed, 67 insertions, 23 deletions

diff --git a/c++/config/commence.in b/c++/config/commence.in
index 381f014..17e5c65 100644
--- a/c++/config/commence.in
+++ b/c++/config/commence.in
@@ -15,9 +15,12 @@
 ## Programs
 SHELL=/bin/sh
 CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
+## H5_CPPFLAGS, H5_CFLAGS, and H5_CXXFLAGS are used for extra flags
+## used to build HDF5 (flags that don't need to be included in h5cc,
+## for instance).
+CXXFLAGS=@CXXFLAGS@ @H5_CXXFLAGS@
+CFLAGS=@CFLAGS@ @H5_CFLAGS@
+CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 ROOT=@ROOT@
 LIBS=@LIBS@
diff --git a/c++/configure b/c++/configure
index 16f86a8..3e25526 100755
--- a/c++/configure
+++ b/c++/configure
@@ -471,7 +471,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS ROOT DEFAULT_LIBS CXX CXXFLAGS LDFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL PERL AR LT_STATIC_EXEC DYNAMIC_DIRS SEARCH SETX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CPPFLAGS H5_CFLAGS H5_CXXFLAGS ROOT DEFAULT_LIBS CXX CXXFLAGS LDFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL PERL AR LT_STATIC_EXEC DYNAMIC_DIRS SEARCH SETX LIBOBJS LTLIBOBJS'
 ac_subst_files='DEPEND COMMENCE CONCLUDE'
 
 # Initialize some variables set by options.
@@ -1585,6 +1585,10 @@ 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
@@ -4878,7 +4882,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4881 "configure"' > conftest.$ac_ext
+  echo '#line 4885 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5445,7 +5449,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5452: \"$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
@@ -7356,7 +7360,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7359 "configure"
+#line 7363 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7454,7 +7458,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7457 "configure"
+#line 7461 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11248,6 +11252,9 @@ s,@host_cpu@,$host_cpu,;t t
 s,@host_vendor@,$host_vendor,;t t
 s,@host_os@,$host_os,;t t
 s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@H5_CPPFLAGS@,$H5_CPPFLAGS,;t t
+s,@H5_CFLAGS@,$H5_CFLAGS,;t t
+s,@H5_CXXFLAGS@,$H5_CXXFLAGS,;t t
 s,@ROOT@,$ROOT,;t t
 s,@DEFAULT_LIBS@,$DEFAULT_LIBS,;t t
 s,@CXX@,$CXX,;t t
diff --git a/c++/configure.in b/c++/configure.in
index ca06636..a677161 100644
--- a/c++/configure.in
+++ b/c++/configure.in
@@ -34,6 +34,12 @@ AC_CONFIG_AUX_DIR([../bin])
 AC_CANONICAL_HOST
 AC_SUBST(CPPFLAGS)
 
+dnl These hold flags which we want to use when compiling HDF5, but which
+dnl the user might not want in h5c++.
+AC_SUBST(H5_CPPFLAGS)
+AC_SUBST(H5_CFLAGS)
+AC_SUBST(H5_CXXFLAGS)
+
 dnl ----------------------------------------------------------------------
 dnl Dump all shell variables values.
 dnl
diff --git a/config/commence.in b/config/commence.in
index 0b2559a..cd7e145 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -15,8 +15,12 @@
 ## Programs
 SHELL=/bin/sh
 CC=@CC@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
+## H5_CPPFLAGS and H5_CFLAGS are used for extra flags used to build HDF5
+## (flags that don't need to be included in h5cc, for instance).
+CFLAGS=@CFLAGS@ @H5_CFLAGS@
+CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@
+H5_CFLAGS=@CFLAGS@
+H5_CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 ROOT=@ROOT@
 LIBS=@LIBS@
diff --git a/configure b/configure
index 9ec32b5..804f282 100755
--- a/configure
+++ b/configure
@@ -473,7 +473,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PDB2HDF PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CPPFLAGS H5_CFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PDB2HDF PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS'
 ac_subst_files='DEPEND COMMENCE CONCLUDE'
 
 # Initialize some variables set by options.
@@ -1626,6 +1626,8 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
 
+
+
  DEFAULT_LIBS=""
 
 
@@ -4570,7 +4572,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4573 "configure"' > conftest.$ac_ext
+  echo '#line 4575 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5137,7 +5139,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5142: \"$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
@@ -7048,7 +7050,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7051 "configure"
+#line 7053 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7146,7 +7148,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7149 "configure"
+#line 7151 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -37377,6 +37379,8 @@ s,@host_cpu@,$host_cpu,;t t
 s,@host_vendor@,$host_vendor,;t t
 s,@host_os@,$host_os,;t t
 s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@H5_CPPFLAGS@,$H5_CPPFLAGS,;t t
+s,@H5_CFLAGS@,$H5_CFLAGS,;t t
 s,@DEFAULT_LIBS@,$DEFAULT_LIBS,;t t
 s,@HSIZET@,$HSIZET,;t t
 s,@CC@,$CC,;t t
diff --git a/configure.in b/configure.in
index 8e7e09f..3148d7c 100644
--- a/configure.in
+++ b/configure.in
@@ -56,6 +56,10 @@ esac
 
 AC_CANONICAL_HOST
 AC_SUBST([CPPFLAGS])
+dnl H5_CPPFLAGS holds flags that we want to use on HDF5, but that the
+dnl user doesn't need to use in h5cc.
+AC_SUBST([H5_CPPFLAGS])
+AC_SUBST([H5_CFLAGS])
 
 dnl Different compilers may need default libraries. They are specified in
 dnl the config/* files, so we put this statement here so that it'll be
diff --git a/fortran/config/commence.in b/fortran/config/commence.in
index 25d4e45..f291361 100644
--- a/fortran/config/commence.in
+++ b/fortran/config/commence.in
@@ -19,9 +19,12 @@ F9X=@F9X@
 F9XMODEXT=@F9XMODEXT@
 F9XMODFLAG=@F9XMODFLAG@
 FSEARCH_DIRS=@FSEARCH_DIRS@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-FFLAGS=@FFLAGS@
+## H5_CPPFLAGS, H5_CFLAGS, and H5_FFLAGS are used for extra flags used
+## to build HDF5 (flags that don't need to be included in h5cc,
+## for instance).
+CFLAGS=@CFLAGS@ @H5_CFLAGS@
+CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@
+FFLAGS=@FFLAGS@ @H5_FFLAGS@
 LDFLAGS=@LDFLAGS@
 ROOT=@ROOT@
 LIBS=@LIBS@
diff --git a/fortran/configure b/fortran/configure
index 99c8858..26d51da 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -471,7 +471,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS FFLAGS FSEARCH_DIRS R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F ROOT F9XSUFFIXFLAG CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT CPP SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP EGREP LIBTOOL PERL AR LT_STATIC_EXEC F9X F9XMODFLAG F9XMODEXT PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL FILTERS MPE ADD_PARALLEL_FILES H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX CC_VERSION FC_VERSION DYNAMIC_DIRS SEARCH SETX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS FFLAGS FSEARCH_DIRS H5_CPPFLAGS H5_FFLAGS H5_CFLAGS R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F ROOT F9XSUFFIXFLAG CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT CPP SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP EGREP LIBTOOL PERL AR LT_STATIC_EXEC F9X F9XMODFLAG F9XMODEXT PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL FILTERS MPE ADD_PARALLEL_FILES H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX CC_VERSION FC_VERSION DYNAMIC_DIRS SEARCH SETX LIBOBJS LTLIBOBJS'
 ac_subst_files='DEPEND COMMENCE CONCLUDE'
 
 # Initialize some variables set by options.
@@ -1594,6 +1594,10 @@ 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
@@ -4305,7 +4309,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4308 "configure"' > conftest.$ac_ext
+  echo '#line 4312 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4872,7 +4876,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4879: \"$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
@@ -6783,7 +6787,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6786 "configure"
+#line 6790 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6881,7 +6885,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6884 "configure"
+#line 6888 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12470,6 +12474,9 @@ s,@host_os@,$host_os,;t t
 s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@FSEARCH_DIRS@,$FSEARCH_DIRS,;t t
+s,@H5_CPPFLAGS@,$H5_CPPFLAGS,;t t
+s,@H5_FFLAGS@,$H5_FFLAGS,;t t
+s,@H5_CFLAGS@,$H5_CFLAGS,;t t
 s,@R_LARGE@,$R_LARGE,;t t
 s,@R_INTEGER@,$R_INTEGER,;t t
 s,@HADDR_T@,$HADDR_T,;t t
diff --git a/fortran/configure.in b/fortran/configure.in
index 8d9c001..a0f1b28 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -51,6 +51,12 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(FFLAGS)
 AC_SUBST(FSEARCH_DIRS)
 
+dnl These hold flags that we want to use while building HDF5, but which
+dnl the user might not want in h5fc. 
+AC_SUBST(H5_CPPFLAGS)
+AC_SUBST(H5_FFLAGS)
+AC_SUBST(H5_CFLAGS)
+
 dnl ----------------------------------------------------------------------
 dnl HDF5 integer variables for the H5fortran_types.f90 file.
 dnl