summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/freebsd2
-rw-r--r--config/gnu-fflags6
-rw-r--r--config/gnu-flags82
-rw-r--r--config/intel-fflags2
-rw-r--r--config/intel-flags4
-rw-r--r--config/linux-gnulibc14
-rw-r--r--config/solaris2.x8
-rwxr-xr-xconfigure48
-rw-r--r--configure.in48
9 files changed, 106 insertions, 98 deletions
diff --git a/config/freebsd b/config/freebsd
index e27deaa..d59eb2a 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -29,7 +29,7 @@ fi
# from /usr/include/sys/cdefs.h
# (Unless we are using g++ as a C compiler)
if test "X-g++" != "X-$CC"; then
- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600"
+ H5_CPPFLAGS="$H5_CPPFLAGS -D_XOPEN_SOURCE=600"
fi
# Figure out C compiler flags
diff --git a/config/gnu-fflags b/config/gnu-fflags
index 7e8d37f..c24e374 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -25,10 +25,10 @@
# f9x_version: Version number: 5.0-2, 5.2-2
#
if test X = "X$f9x_flags_set"; then
- f9x_version="`$FC $FCFLAGS -v 2>&1 |grep 'gcc version' |\
+ f9x_version="`$FC $FCFLAGS $H5_FCFLAGS -v 2>&1 |grep 'gcc version' |\
sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
if test X != "X$f9x_version"; then
-# is_mpi="`$FC $FCFLAGS -help 2>&1 |grep 'link MPI'`"
+# is_mpi="`$FC $FCFLAGS $H5_FCFLAGS -help 2>&1 |grep 'link MPI'`"
f9x_vendor=`echo $f9x_version |sed 's/\([a-z]*\).*/\1/'`
f9x_version=`echo $f9x_version |sed 's/[-a-z]//g'`
if test X = "X$f9x_vendor" -a X != "X$f9x_version"; then
@@ -75,7 +75,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
FC_BASENAME=gfortran40
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
- FCFLAGS="$FCFLAGS -pedantic -Wall -Wconversion -Wunderflow -Wimplicit-interface -W"
+ H5_FCFLAGS="$H5_FCFLAGS -pedantic -Wall -Wconversion -Wunderflow -Wimplicit-interface -W"
# Production
PROD_FCFLAGS="-O2 -s"
diff --git a/config/gnu-flags b/config/gnu-flags
index 84b7196..f0be092 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -25,7 +25,7 @@
# cc_version: Version number: 2.91.60, 2.7.2.1
#
if test X = "X$cc_flags_set"; then
- cc_version="`$CC $CFLAGS -v 2>&1 |grep 'gcc version' |\
+ cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |grep 'gcc version' |\
sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
@@ -141,7 +141,7 @@ case "$cc_vendor-$cc_version" in
esac
# General
- CFLAGS="$CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
+ H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
# Production
case "$cc_vendor-$cc_version" in
@@ -192,38 +192,38 @@ case "$cc_vendor-$cc_version" in
# below. -QAK
gcc-4.[12]*)
# Replace -ansi flag with -std=c99 flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
# Enable mort format checking flags, beyond the basic -Wformat included
# in -Wall
- CFLAGS="$CFLAGS -Wformat-nonliteral -Wformat-security -Wformat-y2k"
+ H5_CFLAGS="$H5_CFLAGS -Wformat-nonliteral -Wformat-security -Wformat-y2k"
# The "unreachable code" warning does not appear to be reliable yet...
- CFLAGS="$CFLAGS -Wunreachable-code"
+ H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
# Append warning flags from gcc-3.3* case
- CFLAGS="$CFLAGS -Wendif-labels"
+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
# Append warning flags from gcc-3.4* case
- CFLAGS="$CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
+ H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
# Replace old -W flag with new -Wextra flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
# Append more extra warning flags that only gcc4.0+ know about
- CFLAGS="$CFLAGS -Wmissing-field-initializers -Wvariadic-macros"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-field-initializers -Wvariadic-macros"
# Append more extra warning flags that only gcc4.1+ know about
- CFLAGS="$CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var"
+ H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var"
# Try out the new "stack protector" feature in gcc 4.1
# (Strictly speaking this isn't really a "warning" flag, so it's added to
@@ -233,16 +233,16 @@ case "$cc_vendor-$cc_version" in
gcc-4.0*)
# Replace -ansi flag with -std=c99 flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
# The "format=2" warning generates too many warnings about valid
# usage in the library.
@@ -252,30 +252,30 @@ case "$cc_vendor-$cc_version" in
#CFLAGS="$CFLAGS -Wunreachable-code"
# Append warning flags from gcc-3.3* case
- CFLAGS="$CFLAGS -Wendif-labels"
+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
# Append warning flags from gcc-3.4* case
- CFLAGS="$CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
+ H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
# Replace old -W flag with new -Wextra flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
# Append more extra warning flags that only gcc4.0+ know about
- CFLAGS="$CFLAGS -Wmissing-field-initializers -Wvariadic-macros"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-field-initializers -Wvariadic-macros"
;;
gcc-3.4*)
# Replace -ansi flag with -std=c99 flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
# The "format=2" warning generates too many warnings about valid
# usage in the library.
@@ -285,27 +285,27 @@ case "$cc_vendor-$cc_version" in
#CFLAGS="$CFLAGS -Wunreachable-code"
# Append warning flags from gcc-3.3* case
- CFLAGS="$CFLAGS -Wendif-labels"
+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
# Append more extra warning flags that only gcc3.4+ know about
- CFLAGS="$CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
+ H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
# Replace old -W flag with new -Wextra flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
;;
gcc-3.3*)
# Replace -ansi flag with -std=c99 flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
# The "format=2" warning generates too many warnings about valid
# usage in the library.
@@ -315,21 +315,21 @@ case "$cc_vendor-$cc_version" in
#CFLAGS="$CFLAGS -Wunreachable-code"
# Append more extra warning flags that only gcc3.3+ know about
- CFLAGS="$CFLAGS -Wendif-labels"
+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
;;
gcc-3.2*)
# Replace -ansi flag with -std=c99 flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
# Append more extra warning flags that only gcc3.2+ know about
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
# The "format=2" warning generates too many warnings about valid
# usage in the library.
@@ -341,18 +341,18 @@ case "$cc_vendor-$cc_version" in
gcc-3*)
# Replace -ansi flag with -std=c99 flag
- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
# Append some extra warning flags that only gcc3+ know about
- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
;;
gcc-2.9[56]*)
# Disable warnings about using 'long long' type
- CFLAGS="$CFLAGS -Wno-long-long"
+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
;;
esac
diff --git a/config/intel-fflags b/config/intel-fflags
index c564126..82ef84c 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -25,7 +25,7 @@
# f9x_version: Version number: 8.0
#
if test X = "X$f9x_flags_set"; then
- f9x_version="`$FC $FCFLAGS -V 2>&1 |grep '^Intel'`"
+ f9x_version="`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 |grep '^Intel'`"
if test X != "X$f9x_version"; then
f9x_vendor=ifort
f9x_version="`echo $f9x_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`"
diff --git a/config/intel-flags b/config/intel-flags
index 88f72ae..2403c30 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -25,7 +25,7 @@
# cc_version: Version number: 8.0
#
if test X = "X$cc_flags_set"; then
- cc_version="`$CC $CFLAGS -V 2>&1 |grep 'Version'`"
+ cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |grep 'Version'`"
if test X != "X$cc_version"; then
cc_vendor=icc
cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
@@ -67,7 +67,7 @@ if test "X-icc" = "X-$cc_vendor"; then
# General
# Default to C99 standard.
- CFLAGS="${CFLAGS:--std=c99 $arch}"
+ H5_CFLAGS="${H5_CFLAGS:--std=c99 $arch}"
# Production
# -Wl,-s to remove all symbols for smaller file
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 9919a24..64d5d67 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -86,12 +86,12 @@ case $FC_BASENAME in
#
f95)
# Set required flag for compiling C stubs
- CFLAGS="$CFLAGS -DH5_ABSOFT"
+ H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT"
F9XSUFFIXFLAG=""
# We force compiler to use upper case for external names
# (just in case since this should be a default EIP)
- FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS"
+ H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
FSEARCH_DIRS=""
DEBUG_FCFLAGS="-g"
PROD_FCFLAGS="-O"
diff --git a/config/solaris2.x b/config/solaris2.x
index 1663efe..6e39bf6 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -30,7 +30,7 @@ fi
# Try solaris native compiler flags
if test "X-" = "X-$cc_flags_set"; then
- CFLAGS="$CFLAGS -erroff=%none -DBSD_COMP"
+ H5_CFLAGS="$H5_CFLAGS -erroff=%none -DBSD_COMP"
DEBUG_CFLAGS="-g -xildoff"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O -s"
@@ -95,14 +95,14 @@ cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
# Specify the "-features=tmplife" if the compiler can handle this...
if test -n "$cxx_version"; then
if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then
- CXXFLAGS="$CXXFLAGS -features=tmplife"
+ H5_CXXFLAGS="$H5_CXXFLAGS -features=tmplife"
fi
fi
# Try solaris native compiler flags
if test -z "$cxx_flags_set"; then
- CXXFLAGS="$CXXFLAGS -instances=static"
- CPPFLAGS="$CPPFLAGS -LANG:std"
+ H5_CXXFLAGS="$H5_CXXFLAGS -instances=static"
+ H5_CPPFLAGS="$H5_CPPFLAGS -LANG:std"
DEBUG_CXXFLAGS=-g
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O -s"
diff --git a/configure b/configure
index 1b0d61e..7734229 100755
--- a/configure
+++ b/configure
@@ -22027,30 +22027,30 @@ echo "${ECHO_T}production" >&6
fi
CONFIG_MODE=production
- CFLAGS="$CFLAGS $PROD_CFLAGS"
- CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
- CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS"
- FCFLAGS="$FCFLAGS $PROD_FCFLAGS"
+ H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
+ H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
+ H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
;;
X-no)
enable_production="no"
echo "$as_me:$LINENO: result: development" >&5
echo "${ECHO_T}development" >&6
CONFIG_MODE=development
- CFLAGS="$CFLAGS $DEBUG_CFLAGS"
- CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS"
- CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS"
- FCFLAGS="$FCFLAGS $DEBUG_FCFLAGS"
+ H5_CFLAGS="$H5_CFLAGS $DEBUG_CFLAGS"
+ H5_CPPFLAGS="$H5_CPPFLAGS $DEBUG_CPPFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS $DEBUG_CXXFLAGS"
+ H5_FCFLAGS="$H5_FCFLAGS $DEBUG_FCFLAGS"
;;
X-pg|X-profile)
enable_production="profile"
echo "$as_me:$LINENO: result: profile" >&5
echo "${ECHO_T}profile" >&6
CONFIG_MODE=profile
- CFLAGS="$CFLAGS $PROFILE_CFLAGS"
- CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS"
- CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS"
- FCFLAGS="$FCFLAGS $PROFILE_FCFLAGS"
+ H5_CFLAGS="$H5_CFLAGS $PROFILE_CFLAGS"
+ H5_CPPFLAGS="$H5_CPPFLAGS $PROFILE_CPPFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS $PROFILE_CXXFLAGS"
+ H5_FCFLAGS="$H5_FCFLAGS $PROFILE_FCFLAGS"
;;
*)
enable_production="user-defined"
@@ -47310,13 +47310,13 @@ all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z"
case "X-$DEBUG_PKG" in
X-yes)
DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
- CPPFLAGS="$CPPFLAGS -UNDEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
echo "$as_me:$LINENO: result: default ($DEBUG_PKG)" >&5
echo "${ECHO_T}default ($DEBUG_PKG)" >&6
;;
X-all)
DEBUG_PKG=$all_packages
- CPPFLAGS="$CPPFLAGS -UNDEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
echo "$as_me:$LINENO: result: all ($DEBUG_PKG)" >&5
echo "${ECHO_T}all ($DEBUG_PKG)" >&6
;;
@@ -47324,7 +47324,7 @@ echo "${ECHO_T}all ($DEBUG_PKG)" >&6
echo "$as_me:$LINENO: result: none" >&5
echo "${ECHO_T}none" >&6
DEBUG_PKG=
- CPPFLAGS="$CPPFLAGS -DNDEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -DNDEBUG"
;;
*)
echo "$as_me:$LINENO: result: $DEBUG_PKG" >&5
@@ -47334,7 +47334,7 @@ esac
if test -n "$DEBUG_PKG"; then
for pkg in `echo $DEBUG_PKG | ${TR} 'a-z,' 'A-Z '`; do
- CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -DH5${pkg}_DEBUG"
done
fi
@@ -47412,13 +47412,13 @@ case "X-$TRACE" in
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
TRACE_API=yes
- CPPFLAGS="$CPPFLAGS -DH5_DEBUG_API"
+ H5_CPPFLAGS="$H5_CPPFLAGS -DH5_DEBUG_API"
;;
X-no|*)
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
TRACE_API=no
- CPPFLAGS="$CPPFLAGS -UH5_DEBUG_API"
+ H5_CPPFLAGS="$H5_CPPFLAGS -UH5_DEBUG_API"
;;
esac
@@ -52995,11 +52995,13 @@ esac
PRINT_N " C Compiler"
PRINT "$CC"
-PRINT_N " CFLAGS"
+PRINT_N " CFLAGS / H5_CFLAGS"
PRINT "$CFLAGS"
+PRINT "$H5_CFLAGS"
-PRINT_N " CPPFLAGS"
+PRINT_N " CPPFLAGS / H5_CPPFLAGS"
PRINT "$CPPFLAGS"
+PRINT "$H5_CPPFLAGS"
PRINT_N " LDFLAGS"
PRINT "$LDFLAGS"
@@ -53039,8 +53041,9 @@ if test X$HDF_CXX = Xyes; then
PRINT_N " C++ Compiler"
PRINT "$CXX"
- PRINT_N " CXXFLAGS"
+ PRINT_N " CXXFLAGS / H5_CXXFLAGS"
PRINT "$CXXFLAGS"
+ PRINT "$H5_CXXFLAGS"
fi
PRINT_N " Fortran"
@@ -53049,8 +53052,9 @@ if test X$HDF_FORTRAN = Xyes; then
PRINT_N " Fortran Compiler"
PRINT "$FC"
- PRINT_N " FCFLAGS"
+ PRINT_N " FCFLAGS / H5_FCFLAGS"
PRINT "$FCFLAGS"
+ PRINT "$H5_FCFLAGS"
fi
PRINT ""
diff --git a/configure.in b/configure.in
index c6f095a..7b7ce2b 100644
--- a/configure.in
+++ b/configure.in
@@ -791,28 +791,28 @@ case "X-$enable_production" in
fi
CONFIG_MODE=production
- CFLAGS="$CFLAGS $PROD_CFLAGS"
- CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
- CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS"
- FCFLAGS="$FCFLAGS $PROD_FCFLAGS"
+ H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
+ H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
+ H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
;;
X-no)
enable_production="no"
AC_MSG_RESULT([development])
CONFIG_MODE=development
- CFLAGS="$CFLAGS $DEBUG_CFLAGS"
- CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS"
- CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS"
- FCFLAGS="$FCFLAGS $DEBUG_FCFLAGS"
+ H5_CFLAGS="$H5_CFLAGS $DEBUG_CFLAGS"
+ H5_CPPFLAGS="$H5_CPPFLAGS $DEBUG_CPPFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS $DEBUG_CXXFLAGS"
+ H5_FCFLAGS="$H5_FCFLAGS $DEBUG_FCFLAGS"
;;
X-pg|X-profile)
enable_production="profile"
AC_MSG_RESULT([profile])
CONFIG_MODE=profile
- CFLAGS="$CFLAGS $PROFILE_CFLAGS"
- CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS"
- CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS"
- FCFLAGS="$FCFLAGS $PROFILE_FCFLAGS"
+ H5_CFLAGS="$H5_CFLAGS $PROFILE_CFLAGS"
+ H5_CPPFLAGS="$H5_CPPFLAGS $PROFILE_CPPFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS $PROFILE_CXXFLAGS"
+ H5_FCFLAGS="$H5_FCFLAGS $PROFILE_FCFLAGS"
;;
*)
enable_production="user-defined"
@@ -1749,18 +1749,18 @@ all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z"
case "X-$DEBUG_PKG" in
X-yes)
DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
- CPPFLAGS="$CPPFLAGS -UNDEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
AC_MSG_RESULT([default ($DEBUG_PKG)])
;;
X-all)
DEBUG_PKG=$all_packages
- CPPFLAGS="$CPPFLAGS -UNDEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
AC_MSG_RESULT([all ($DEBUG_PKG)])
;;
X-|X-no|X-none)
AC_MSG_RESULT([none])
DEBUG_PKG=
- CPPFLAGS="$CPPFLAGS -DNDEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -DNDEBUG"
;;
*)
AC_MSG_RESULT([$DEBUG_PKG])
@@ -1769,7 +1769,7 @@ esac
if test -n "$DEBUG_PKG"; then
for pkg in `echo $DEBUG_PKG | ${TR} 'a-z,' 'A-Z '`; do
- CPPFLAGS="$CPPFLAGS -DH5${pkg}_DEBUG"
+ H5_CPPFLAGS="$H5_CPPFLAGS -DH5${pkg}_DEBUG"
done
fi
@@ -1842,12 +1842,12 @@ case "X-$TRACE" in
X-yes)
AC_MSG_RESULT([yes])
TRACE_API=yes
- CPPFLAGS="$CPPFLAGS -DH5_DEBUG_API"
+ H5_CPPFLAGS="$H5_CPPFLAGS -DH5_DEBUG_API"
;;
X-no|*)
AC_MSG_RESULT([no])
TRACE_API=no
- CPPFLAGS="$CPPFLAGS -UH5_DEBUG_API"
+ H5_CPPFLAGS="$H5_CPPFLAGS -UH5_DEBUG_API"
;;
esac
@@ -3437,11 +3437,13 @@ esac
PRINT_N " C Compiler"
PRINT "$CC"
-PRINT_N " CFLAGS"
+PRINT_N " CFLAGS / H5_CFLAGS"
PRINT "$CFLAGS"
+PRINT "$H5_CFLAGS"
-PRINT_N " CPPFLAGS"
+PRINT_N " CPPFLAGS / H5_CPPFLAGS"
PRINT "$CPPFLAGS"
+PRINT "$H5_CPPFLAGS"
PRINT_N " LDFLAGS"
PRINT "$LDFLAGS"
@@ -3481,8 +3483,9 @@ if test X$HDF_CXX = Xyes; then
PRINT_N " C++ Compiler"
PRINT "$CXX"
- PRINT_N " CXXFLAGS"
+ PRINT_N " CXXFLAGS / H5_CXXFLAGS"
PRINT "$CXXFLAGS"
+ PRINT "$H5_CXXFLAGS"
fi
PRINT_N " Fortran"
@@ -3491,8 +3494,9 @@ if test X$HDF_FORTRAN = Xyes; then
PRINT_N " Fortran Compiler"
PRINT "$FC"
- PRINT_N " FCFLAGS"
+ PRINT_N " FCFLAGS / H5_FCFLAGS"
PRINT "$FCFLAGS"
+ PRINT "$H5_FCFLAGS"
fi
PRINT ""