mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
[svn-r12215] Purpose:
Code cleanup
Description:
Add "--enable-group-revision" configure flag (defaulting to off).
Also, "prettify" the configure summary a bit
Platforms tested:
FreeBSD 4.11 (sleipnir)
Linux 2.4 32-bit (heping)
Linux 2.4 64-bit (mir)
Solaris 2.9 (shanti)
This commit is contained in:
Quincey Koziol
parent
36a381e961
commit
85fc6fab21
103
configure
vendored
103
configure
vendored
@ -1072,6 +1072,8 @@ Optional Features:
|
||||
is most packages.
|
||||
--enable-funcstack Enable the function stack tracing (for developer
|
||||
debugging).
|
||||
--enable-group-revision Enable the group revision code (for internal
|
||||
developers only).
|
||||
--enable-trace Enable API tracing capability. Default=no if debug
|
||||
is disabled.
|
||||
--enable-instrument Enable library instrumentation of optimization
|
||||
@ -3530,7 +3532,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:3533:" \
|
||||
echo "$as_me:3535:" \
|
||||
"checking for Fortran compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -3825,7 +3827,7 @@ _ACEOF
|
||||
# flags.
|
||||
ac_save_FFLAGS=$FCFLAGS
|
||||
FCFLAGS="$FCFLAGS $ac_verb"
|
||||
(eval echo $as_me:3828: \"$ac_link\") >&5
|
||||
(eval echo $as_me:3830: \"$ac_link\") >&5
|
||||
ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_fc_v_output" >&5
|
||||
FCFLAGS=$ac_save_FFLAGS
|
||||
@ -3903,7 +3905,7 @@ _ACEOF
|
||||
# flags.
|
||||
ac_save_FFLAGS=$FCFLAGS
|
||||
FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
|
||||
(eval echo $as_me:3906: \"$ac_link\") >&5
|
||||
(eval echo $as_me:3908: \"$ac_link\") >&5
|
||||
ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_fc_v_output" >&5
|
||||
FCFLAGS=$ac_save_FFLAGS
|
||||
@ -6482,7 +6484,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 6485 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6487 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7612,7 +7614,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:7615:" \
|
||||
echo "$as_me:7617:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -8681,11 +8683,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8684: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8686: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8688: \$? = $ac_status" >&5
|
||||
echo "$as_me:8690: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -8936,11 +8938,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8939: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8941: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8943: \$? = $ac_status" >&5
|
||||
echo "$as_me:8945: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -8996,11 +8998,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8999: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9001: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:9003: \$? = $ac_status" >&5
|
||||
echo "$as_me:9005: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -11268,7 +11270,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11271 "configure"
|
||||
#line 11273 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11366,7 +11368,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11369 "configure"
|
||||
#line 11371 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13602,11 +13604,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13605: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13607: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13609: \$? = $ac_status" >&5
|
||||
echo "$as_me:13611: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -13662,11 +13664,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13665: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13667: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13669: \$? = $ac_status" >&5
|
||||
echo "$as_me:13671: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -15081,7 +15083,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15084 "configure"
|
||||
#line 15086 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -15179,7 +15181,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15182 "configure"
|
||||
#line 15184 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -16034,11 +16036,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16037: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16039: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16041: \$? = $ac_status" >&5
|
||||
echo "$as_me:16043: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -16094,11 +16096,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16097: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16099: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16101: \$? = $ac_status" >&5
|
||||
echo "$as_me:16103: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -18150,11 +18152,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18153: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18155: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18157: \$? = $ac_status" >&5
|
||||
echo "$as_me:18159: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -18405,11 +18407,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18408: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18410: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18412: \$? = $ac_status" >&5
|
||||
echo "$as_me:18414: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -18465,11 +18467,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18468: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18470: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18472: \$? = $ac_status" >&5
|
||||
echo "$as_me:18474: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -20737,7 +20739,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20740 "configure"
|
||||
#line 20742 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -20835,7 +20837,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20838 "configure"
|
||||
#line 20840 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -47824,6 +47826,32 @@ echo "${ECHO_T}no" >&6
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "$as_me:$LINENO: checking whether group revision code is enabled" >&5
|
||||
echo $ECHO_N "checking whether group revision code is enabled... $ECHO_C" >&6
|
||||
# Check whether --enable-group-revision or --disable-group-revision was given.
|
||||
if test "${enable_group_revision+set}" = set; then
|
||||
enableval="$enable_group_revision"
|
||||
GROUPREVISION=$enableval
|
||||
fi;
|
||||
|
||||
case "X-$GROUPREVISION" in
|
||||
X-yes)
|
||||
GROUPREVISION=yes
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define GROUP_REVISION 1
|
||||
_ACEOF
|
||||
|
||||
;;
|
||||
*)
|
||||
GROUPREVISION=no
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for API tracing" >&5
|
||||
echo $ECHO_N "checking for API tracing... $ECHO_C" >&6;
|
||||
@ -52961,8 +52989,12 @@ IF_ENABLED_DISABLED() {
|
||||
fi
|
||||
}
|
||||
|
||||
PRINT "Configure Summary"
|
||||
PRINT ""
|
||||
PRINT " Configure Summary"
|
||||
PRINT " ================="
|
||||
PRINT ""
|
||||
PRINT "Compiling Options:"
|
||||
PRINT "------------------"
|
||||
|
||||
PRINT_N " Compilation Mode"
|
||||
case "X-$enable_production" in
|
||||
@ -53009,7 +53041,9 @@ IF_YES_NO "$TRACE_API"
|
||||
PRINT_N " Optimization Instrumentation"
|
||||
IF_YES_NO "$INSTRUMENT"
|
||||
|
||||
PRINT ""
|
||||
PRINT "Languages:"
|
||||
PRINT "----------"
|
||||
|
||||
PRINT_N " C++"
|
||||
IF_YES_NO "$HDF_CXX"
|
||||
@ -53031,7 +53065,9 @@ if test X$HDF_FORTRAN = Xyes; then
|
||||
PRINT "$FCFLAGS"
|
||||
fi
|
||||
|
||||
PRINT ""
|
||||
PRINT "Features:"
|
||||
PRINT "---------"
|
||||
|
||||
PRINT_N " dmalloc"
|
||||
IF_YES_NO "$HAVE_DMALLOC"
|
||||
@ -53042,6 +53078,9 @@ IF_YES_NO "$FPHDF5"
|
||||
PRINT_N " Function Stack Tracing"
|
||||
IF_ENABLED_DISABLED "$FUNCSTACK"
|
||||
|
||||
PRINT_N " Group Revision"
|
||||
IF_ENABLED_DISABLED "$GROUPREVISION"
|
||||
|
||||
PRINT_N " GPFS"
|
||||
IF_YES_NO "$GPFS"
|
||||
|
||||
|
||||
35
configure.in
35
configure.in
@ -1838,6 +1838,28 @@ case "X-$FUNCSTACK" in
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl ----------------------------------------------------------------------
|
||||
dnl Check if they would like the group revision code compiled in
|
||||
dnl
|
||||
AC_MSG_CHECKING([whether group revision code is enabled])
|
||||
AC_ARG_ENABLE([group-revision],
|
||||
[AC_HELP_STRING([--enable-group-revision],
|
||||
[Enable the group revision code (for internal developers only).])],
|
||||
[GROUPREVISION=$enableval])
|
||||
|
||||
case "X-$GROUPREVISION" in
|
||||
X-yes)
|
||||
GROUPREVISION=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([GROUP_REVISION], [1],
|
||||
[Define if the group revision code is to be compiled in])
|
||||
;;
|
||||
*)
|
||||
GROUPREVISION=no
|
||||
AC_MSG_RESULT([no])
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl ----------------------------------------------------------------------
|
||||
dnl Enable tracing of the API
|
||||
dnl This must come after the enable-debug since it depends on debug.
|
||||
@ -3403,8 +3425,12 @@ IF_ENABLED_DISABLED() {
|
||||
fi
|
||||
}
|
||||
|
||||
PRINT "Configure Summary"
|
||||
PRINT ""
|
||||
PRINT " Configure Summary"
|
||||
PRINT " ================="
|
||||
PRINT ""
|
||||
PRINT "Compiling Options:"
|
||||
PRINT "------------------"
|
||||
|
||||
PRINT_N " Compilation Mode"
|
||||
case "X-$enable_production" in
|
||||
@ -3451,7 +3477,9 @@ IF_YES_NO "$TRACE_API"
|
||||
PRINT_N " Optimization Instrumentation"
|
||||
IF_YES_NO "$INSTRUMENT"
|
||||
|
||||
PRINT ""
|
||||
PRINT "Languages:"
|
||||
PRINT "----------"
|
||||
|
||||
PRINT_N " C++"
|
||||
IF_YES_NO "$HDF_CXX"
|
||||
@ -3473,7 +3501,9 @@ if test X$HDF_FORTRAN = Xyes; then
|
||||
PRINT "$FCFLAGS"
|
||||
fi
|
||||
|
||||
PRINT ""
|
||||
PRINT "Features:"
|
||||
PRINT "---------"
|
||||
|
||||
PRINT_N " dmalloc"
|
||||
IF_YES_NO "$HAVE_DMALLOC"
|
||||
@ -3484,6 +3514,9 @@ IF_YES_NO "$FPHDF5"
|
||||
PRINT_N " Function Stack Tracing"
|
||||
IF_ENABLED_DISABLED "$FUNCSTACK"
|
||||
|
||||
PRINT_N " Group Revision"
|
||||
IF_ENABLED_DISABLED "$GROUPREVISION"
|
||||
|
||||
PRINT_N " GPFS"
|
||||
IF_YES_NO "$GPFS"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user