summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure76
1 files changed, 37 insertions, 39 deletions
diff --git a/configure b/configure
index d07c779..4d32a95 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 17628 2009-10-11 12:49:32Z lrknox .
+# From configure.in Id: configure.in 17639 2009-10-13 21:55:21Z mamcgree .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for HDF5 1.9.49.
#
@@ -23213,10 +23213,13 @@ $as_echo "suppressed" >&6; }
fi
saved_CPPFLAGS="$CPPFLAGS"
+ saved_AM_CPPFLAGS="$AM_CPPFLAGS"
saved_LDFLAGS="$LDFLAGS"
+ saved_AM_LDFLAGS="$AM_LDFLAGS"
if test -n "$dmalloc_inc"; then
CPPFLAGS="$CPPFLAGS -I$dmalloc_inc"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
fi
for ac_header in dmalloc.h
@@ -23226,9 +23229,9 @@ if test "x$ac_cv_header_dmalloc_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DMALLOC_H 1
_ACEOF
- AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
+
else
- CPPFLAGS="$saved_CPPFLAGS"
+ CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
fi
done
@@ -23236,6 +23239,7 @@ done
if test -n "$dmalloc_lib"; then
LDFLAGS="$LDFLAGS -L$dmalloc_lib"
+ AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -ldmalloc" >&5
@@ -23290,14 +23294,10 @@ _ACEOF
LIBS="-ldmalloc $LIBS"
else
- LDFLAGS="$saved_LDFLAGS"; unset HAVE_DMALLOC
+ LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DMALLOC
fi
- if test -n "$HAVE_DMALLOC" -a -n "$dmalloc_lib"; then
- AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
- fi
-
if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
as_fn_error "couldn't find dmalloc library" "$LINENO" 5
fi
@@ -23424,10 +23424,13 @@ $as_echo "suppressed" >&6; }
fi
saved_CPPFLAGS="$CPPFLAGS"
+ saved_AM_CPPFLAGS="$AM_CPPFLAGS"
saved_LDFLAGS="$LDFLAGS"
+ saved_AM_LDFLAGS="$AM_LDFLAGS"
if test -n "$zlib_inc"; then
CPPFLAGS="$CPPFLAGS -I$zlib_inc"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$zlib_inc"
fi
for ac_header in zlib.h
@@ -23437,9 +23440,9 @@ if test "x$ac_cv_header_zlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
- HAVE_ZLIB_H="yes"; AM_CPPFLAGS="$AM_CPPFLAGS -I$zlib_inc"
+ HAVE_ZLIB_H="yes"
else
- CPPFLAGS="$saved_CPPFLAGS"
+ CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
fi
done
@@ -23447,6 +23450,7 @@ done
if test -n "$zlib_lib"; then
LDFLAGS="$LDFLAGS -L$zlib_lib"
+ AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
@@ -23501,7 +23505,7 @@ _ACEOF
LIBS="-lz $LIBS"
else
- LDFLAGS="$saved_LDFLAGS"; unset HAVE_ZLIB
+ LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_ZLIB
fi
ac_fn_c_check_func "$LINENO" "compress2" "ac_cv_func_compress2"
@@ -23510,10 +23514,6 @@ if test "x$ac_cv_func_compress2" = x""yes; then :
fi
- if test -n "$HAVE_ZLIB" -a -n "$zlib_lib"; then
- AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib"
- fi
-
if test -z "$HAVE_ZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
as_fn_error "couldn't find zlib library" "$LINENO" 5
fi
@@ -23648,10 +23648,13 @@ $as_echo "suppressed" >&6; }
fi
saved_CPPFLAGS="$CPPFLAGS"
+ saved_AM_CPPFLAGS="$AM_CPPFLAGS"
saved_LDFLAGS="$LDFLAGS"
+ saved_AM_LDFLAGS="$AM_LDFLAGS"
if test -n "$szlib_inc"; then
CPPFLAGS="$CPPFLAGS -I$szlib_inc"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
fi
for ac_header in szlib.h
@@ -23661,9 +23664,9 @@ if test "x$ac_cv_header_szlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SZLIB_H 1
_ACEOF
- HAVE_SZLIB_H="yes"; AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
+ HAVE_SZLIB_H="yes"
else
- CPPFLAGS="$saved_CPPFLAGS"
+ CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
fi
done
@@ -23671,6 +23674,7 @@ done
if test -n "$szlib_lib"; then
LDFLAGS="$LDFLAGS -L$szlib_lib"
+ AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -lsz" >&5
@@ -23725,14 +23729,10 @@ _ACEOF
LIBS="-lsz $LIBS"
else
- LDFLAGS="$saved_LDFLAGS"; unset HAVE_SZLIB
+ LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB
fi
- if test -n "$HAVE_SZLIB" -a -n "$szlib_lib"; then
- AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
- fi
-
if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
as_fn_error "couldn't find szlib library" "$LINENO" 5
fi
@@ -24010,7 +24010,9 @@ $as_echo "suppressed" >&6; }
if test -n "$pthread_inc"; then
saved_CPPFLAGS="$CPPFLAGS"
+ saved_AM_CPPFLAGS="$AM_CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$pthread_inc"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$pthread_inc"
for ac_header in pthread.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
@@ -24018,14 +24020,13 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_H 1
_ACEOF
- AM_CPPFLAGS="$AM_CPPFLAGS -I$pthread_inc"
+
else
- unset PTHREAD
+ CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset PTHREAD
fi
done
- CPPFLAGS="$saved_CPPFLAGS"
else
for ac_header in pthread.h
do :
@@ -24045,7 +24046,9 @@ done
if test -n "$pthread_lib"; then
saved_LDFLAGS="$LDFLAGS"
+ saved_AM_LDFLAGS="$AM_LDFLAGS"
LDFLAGS="$LDFLAGS -L$pthread_lib"
+ AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
@@ -24098,14 +24101,10 @@ _ACEOF
LIBS="-lpthread $LIBS"
else
- LDFLAGS="$saved_LDFLAGS"; unset PTHREAD
+ LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset PTHREAD
fi
- if test -n "$PTHREAD"; then
- AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
- fi
-
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
@@ -26334,7 +26333,9 @@ fi
if test -n "$mpe_inc"; then
saved_CPPFLAGS="$CPPFLAGS"
+ saved_AM_CPPFLAGS="$AM_CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$mpe_inc"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
for ac_header in mpe.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
@@ -26342,14 +26343,13 @@ if test "x$ac_cv_header_mpe_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MPE_H 1
_ACEOF
- AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
+
else
- unset MPE
+ CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset MPE
fi
done
- CPPFLAGS="$saved_CPPFLAGS"
else
for ac_header in mpe.h
do :
@@ -26369,7 +26369,9 @@ done
if test -n "$mpe_lib"; then
saved_LDFLAGS="$LDFLAGS"
+ saved_AM_LDFLAGS="$AM_LDFLAGS"
LDFLAGS="$LDFLAGS -L$mpe_lib"
+ AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
if test "${ac_cv_lib_mpe_MPE_Init_log+set}" = set; then :
@@ -26422,7 +26424,7 @@ _ACEOF
LIBS="-lmpe $LIBS"
else
- LDFLAGS="$saved_LDFLAGS"; unset MPE
+ LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOG_Init in -llmpe" >&5
@@ -26477,14 +26479,10 @@ _ACEOF
LIBS="-llmpe $LIBS"
else
- LDFLAGS="$saved_LDFLAGS"; unset MPE
+ LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
fi
- if test -n "$MPE"; then
- AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
- fi
-
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
generated by cgit v0.12 at 2024-11-10 14:16:04 (GMT)