summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2008-09-02 15:04:59 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2008-09-02 15:04:59 (GMT)
commit74457ab98c53d30923179318fc8b6b141627570e (patch)
tree5b7fea9634194b904c64ce7fd5b403c0795cd908
parent709654724bd8b7d148ddd977a835782f1fe8a2c6 (diff)
downloadhdf5-74457ab98c53d30923179318fc8b6b141627570e.zip
hdf5-74457ab98c53d30923179318fc8b6b141627570e.tar.gz
hdf5-74457ab98c53d30923179318fc8b6b141627570e.tar.bz2
[svn-r15577] Description:
Moved AM_CONDITIONAL([FORTRAN_HAVE_SIZEOF]....) outside of Fortran conditional loop so that the value gets registered regardless of whether Fortran is enabled.
-rwxr-xr-xconfigure76
-rw-r--r--configure.in10
2 files changed, 45 insertions, 41 deletions
diff --git a/configure b/configure
index 7627967..bb0fbe7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 15540 2008-08-26 20:10:57Z brtnfld .
+# From configure.in Id: configure.in 15570 2008-09-01 15:25:02Z brtnfld .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for HDF5 1.9.16.
#
@@ -3989,6 +3989,10 @@ if test "${enable_fortran+set}" = set; then
fi
+
+HAVE_SIZEOF="no"
+FORTRAN_DEFAULT_REALisDBLE="no"
+
if test "X$HDF_FORTRAN" = "Xyes"; then
echo "yes"
@@ -5530,8 +5534,6 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
{ echo "$as_me:$LINENO: checking if Fortran compiler supports intrinsic SIZEOF" >&5
echo $ECHO_N "checking if Fortran compiler supports intrinsic SIZEOF... $ECHO_C" >&6; }
-
- HAVE_SIZEOF="no"
cat >conftest.$ac_ext <<_ACEOF
program main
@@ -5568,18 +5570,10 @@ echo "${ECHO_T}no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "X$HAVE_SIZEOF" = "Xyes"; then
- FORTRAN_HAVE_SIZEOF_TRUE=
- FORTRAN_HAVE_SIZEOF_FALSE='#'
-else
- FORTRAN_HAVE_SIZEOF_TRUE='#'
- FORTRAN_HAVE_SIZEOF_FALSE=
-fi
- FORTRAN_DEFAULT_REALisDBLE="no"
{ echo "$as_me:$LINENO: checking if Fortran default REAL is DOUBLE PRECISION" >&5
echo $ECHO_N "checking if Fortran default REAL is DOUBLE PRECISION... $ECHO_C" >&6; }
@@ -5660,6 +5654,14 @@ else
echo "no"
fi
+ if test "X$HAVE_SIZEOF" = "Xyes"; then
+ FORTRAN_HAVE_SIZEOF_TRUE=
+ FORTRAN_HAVE_SIZEOF_FALSE='#'
+else
+ FORTRAN_HAVE_SIZEOF_TRUE='#'
+ FORTRAN_HAVE_SIZEOF_FALSE=
+fi
+
if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
FORTRAN_DEFAULT_REALisDBLE_F_TRUE=
FORTRAN_DEFAULT_REALisDBLE_F_FALSE='#'
@@ -8054,13 +8056,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8057: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8059: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8060: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8062: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8063: output\"" >&5)
+ (eval echo "\"\$as_me:8065: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9168,7 +9170,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9171 "configure"' > conftest.$ac_ext
+ echo '#line 9173 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11736,11 +11738,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11739: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11741: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11743: \$? = $ac_status" >&5
+ echo "$as_me:11745: \$? = $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 other than the usual output.
@@ -12060,11 +12062,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12063: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12065: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12067: \$? = $ac_status" >&5
+ echo "$as_me:12069: \$? = $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 other than the usual output.
@@ -12165,11 +12167,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12168: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12170: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12172: \$? = $ac_status" >&5
+ echo "$as_me:12174: \$? = $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
@@ -12220,11 +12222,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12223: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12225: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12227: \$? = $ac_status" >&5
+ echo "$as_me:12229: \$? = $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
@@ -15048,7 +15050,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 15051 "configure"
+#line 15053 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15148,7 +15150,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 15151 "configure"
+#line 15153 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17167,11 +17169,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17170: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17172: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17174: \$? = $ac_status" >&5
+ echo "$as_me:17176: \$? = $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 other than the usual output.
@@ -17266,11 +17268,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17269: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17271: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17273: \$? = $ac_status" >&5
+ echo "$as_me:17275: \$? = $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
@@ -17318,11 +17320,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17321: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17325: \$? = $ac_status" >&5
+ echo "$as_me:17327: \$? = $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
@@ -18848,11 +18850,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18851: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18855: \$? = $ac_status" >&5
+ echo "$as_me:18857: \$? = $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 other than the usual output.
@@ -18947,11 +18949,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18950: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18952: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18954: \$? = $ac_status" >&5
+ echo "$as_me:18956: \$? = $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
@@ -18999,11 +19001,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19002: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19004: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19006: \$? = $ac_status" >&5
+ echo "$as_me:19008: \$? = $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
diff --git a/configure.in b/configure.in
index 8e9782b..9c04f7a 100644
--- a/configure.in
+++ b/configure.in
@@ -318,6 +318,10 @@ AC_ARG_ENABLE([fortran],
[Compile the Fortran interface [default=no]])],
[HDF_FORTRAN=$enableval])
+
+HAVE_SIZEOF="no"
+FORTRAN_DEFAULT_REALisDBLE="no"
+
if test "X$HDF_FORTRAN" = "Xyes"; then
echo "yes"
@@ -385,20 +389,17 @@ dnl --------------------------------------------------------------------
dnl See if the fortran compiler supports the intrinsic function "SIZEOF"
AC_MSG_CHECKING([if Fortran compiler supports intrinsic SIZEOF])
-
- HAVE_SIZEOF="no"
AC_TRY_COMPILE(,[
i = sizeof(x)
], [AC_MSG_RESULT(yes)
HAVE_SIZEOF="yes"],
AC_MSG_RESULT(no))
- AM_CONDITIONAL([FORTRAN_HAVE_SIZEOF], [test "X$HAVE_SIZEOF" = "Xyes"])
+
dnl Check to see if -r8 was specified to determine if we need to
dnl compile the DOUBLE PRECISION interfaces.
- FORTRAN_DEFAULT_REALisDBLE="no"
AC_MSG_CHECKING([if Fortran default REAL is DOUBLE PRECISION])
AC_TRY_RUN([
@@ -432,6 +433,7 @@ else
echo "no"
fi
+AM_CONDITIONAL([FORTRAN_HAVE_SIZEOF], [test "X$HAVE_SIZEOF" = "Xyes"])
AM_CONDITIONAL([FORTRAN_DEFAULT_REALisDBLE_F], [test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"])
dnl ----------------------------------------------------------------------