[jhdf5: 2/3] update to version 2.8
Clément David
davidcl at fedoraproject.org
Fri Jan 27 07:40:19 UTC 2012
commit 92b677d1eb72351ebd48007b2f272140e2ce4531
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Thu Jan 26 07:44:20 2012 +0100
update to version 2.8
.gitignore | 11 +-
0001-add-a-generic-linux-host.patch | 12 +-
0002-add-H4_-prefix-to-constants.patch | 26 +-
0003-use-system-linker-for-shared-library.patch | 68 +-
0004-remove-writable-prefix-check.patch | 44 +-
0005-update-config.sub-and-config.guess.patch | 8 +-
0006-clean-hdfview.sh.patch | 12 +-
0007-update-configure.patch | 1582 ++++++++++++-----------
jhdf5.spec | 12 +-
sources | 2 +-
10 files changed, 964 insertions(+), 813 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7648400..20e029a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
+/clog
+/*~
+/*.log
+/*.src.rpm
+/hdf-java
+/noarch
+/i686
+/x86_64
/hdf-java-2.7-src.tar
-clog
-*~
+/hdf-java-2.8-src.tar
diff --git a/0001-add-a-generic-linux-host.patch b/0001-add-a-generic-linux-host.patch
index 2932eb8..935dc46 100644
--- a/0001-add-a-generic-linux-host.patch
+++ b/0001-add-a-generic-linux-host.patch
@@ -1,6 +1,6 @@
-From 2fae6b2991ab39e7a3844f49737ebf2ee042390e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Thu, 23 Jun 2011 21:04:43 +0200
+From cc4c01c62b8a6b581881a901b066500bb2e1652f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:50:32 +0100
Subject: [PATCH 1/7] add a generic linux host
---
@@ -8,7 +8,7 @@ Subject: [PATCH 1/7] add a generic linux host
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
-index 3bd55e5..514b829 100755
+index 7a0e37f..203a4e2 100755
--- a/configure.in
+++ b/configure.in
@@ -88,6 +88,13 @@ AC_CANONICAL_SYSTEM
@@ -25,7 +25,7 @@ index 3bd55e5..514b829 100755
alpha-dec-osf*.*) TARGETLIB="alpha"
LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
LLEXT="a";
-@@ -651,6 +658,14 @@ JHVINST=$JH45INST
+@@ -660,6 +667,14 @@ JHVINST=$JH45INST
JH5INST=$JH45INST
case $target in
@@ -41,5 +41,5 @@ index 3bd55e5..514b829 100755
LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
LLEXT="a";
--
-1.7.7
+1.7.7.6
diff --git a/0002-add-H4_-prefix-to-constants.patch b/0002-add-H4_-prefix-to-constants.patch
index c4f9bf8..9fdabce 100644
--- a/0002-add-H4_-prefix-to-constants.patch
+++ b/0002-add-H4_-prefix-to-constants.patch
@@ -1,6 +1,6 @@
-From 36c2d1a4188ae4cb2182bf7b07f06ca6f51688c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Mon, 27 Jun 2011 20:54:24 +0200
+From e42efab7a7f63e905f92a466acbdbd1767a6517d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:50:45 +0100
Subject: [PATCH 2/7] add H4_ prefix to constants
---
@@ -10,10 +10,10 @@ Subject: [PATCH 2/7] add H4_ prefix to constants
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/native/hdflib/hdfsdsImp.c b/native/hdflib/hdfsdsImp.c
-index dd3d7b7..0842bc6 100755
+index ff65e02..b88eb35 100755
--- a/native/hdflib/hdfsdsImp.c
+++ b/native/hdflib/hdfsdsImp.c
-@@ -147,7 +147,7 @@ jintArray argv) /* OUT: rank, NT, nattr */
+@@ -149,7 +149,7 @@ jintArray argv) /* OUT: rank, NT, nattr */
int32 *dims;
int32 *theArgs;
@@ -22,7 +22,7 @@ index dd3d7b7..0842bc6 100755
if (cname == NULL) {
h4outOfMemory(env, "SDgetinfo");
return FAIL;
-@@ -158,7 +158,7 @@ jintArray argv) /* OUT: rank, NT, nattr */
+@@ -160,7 +160,7 @@ jintArray argv) /* OUT: rank, NT, nattr */
retVal = SDgetinfo((int32)sdsid, cname, &(theArgs[0]), dims,
&(theArgs[1]), &(theArgs[2]));
@@ -32,10 +32,10 @@ index dd3d7b7..0842bc6 100755
if (retVal == FAIL) {
ENVPTR->ReleaseIntArrayElements(ENVPAR dimsizes,(jint *)dims,JNI_ABORT);
diff --git a/native/hdflib/hdfstructsutil.c b/native/hdflib/hdfstructsutil.c
-index 95fc128..5b07d6c 100755
+index 9e22871..1d48988 100755
--- a/native/hdflib/hdfstructsutil.c
+++ b/native/hdflib/hdfstructsutil.c
-@@ -409,7 +409,7 @@ jboolean bb;
+@@ -411,7 +411,7 @@ jboolean bb;
lens = (jint *)ENVPTR->GetIntArrayElements(ENVPAR (jintArray)larr,&bb);
@@ -44,7 +44,7 @@ index 95fc128..5b07d6c 100755
cinf->comp.chunk_lengths[i] = (int32)lens[i];
}
-@@ -453,7 +453,7 @@ jboolean bb;
+@@ -452,7 +452,7 @@ jboolean bb;
lens = (jint *)ENVPTR->GetIntArrayElements(ENVPAR (jintArray)larr,&bb);
@@ -68,10 +68,10 @@ index 95fc128..5b07d6c 100755
/* release rarray? */
diff --git a/native/hdflib/hdfvdataImp.c b/native/hdflib/hdfvdataImp.c
-index f7ee681..4fdbd97 100755
+index 80b85d7..36f3a13 100755
--- a/native/hdflib/hdfvdataImp.c
+++ b/native/hdflib/hdfvdataImp.c
-@@ -355,7 +355,7 @@ jobjectArray sargs) /* OUT: String fields, vdata_name */
+@@ -357,7 +357,7 @@ jobjectArray sargs) /* OUT: String fields, vdata_name */
return FAIL;
}
@@ -80,7 +80,7 @@ index f7ee681..4fdbd97 100755
if (name == NULL) {
free(flds);
return FAIL;
-@@ -373,7 +373,7 @@ jobjectArray sargs) /* OUT: String fields, vdata_name */
+@@ -375,7 +375,7 @@ jobjectArray sargs) /* OUT: String fields, vdata_name */
(int32 *)&(theIargs[1]), flds, (int32 *)&(theIargs[2]), name);
flds[MAX_FIELD_SIZE] = '\0';
@@ -90,5 +90,5 @@ index f7ee681..4fdbd97 100755
if (rval == FAIL) {
ENVPTR->ReleaseIntArrayElements(ENVPAR iargs,theIargs,JNI_ABORT);
--
-1.7.7
+1.7.7.6
diff --git a/0003-use-system-linker-for-shared-library.patch b/0003-use-system-linker-for-shared-library.patch
index 1d49fd8..2b92af0 100644
--- a/0003-use-system-linker-for-shared-library.patch
+++ b/0003-use-system-linker-for-shared-library.patch
@@ -1,6 +1,6 @@
-From 2098910031b32f9a45fd72ce085d0c05d03a4a6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Mon, 27 Jun 2011 21:08:55 +0200
+From 2d2bdf8efd831e99a597e3967dd7b3f519bb8190 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:50:56 +0100
Subject: [PATCH 3/7] use system linker for shared library
---
@@ -9,51 +9,51 @@ Subject: [PATCH 3/7] use system linker for shared library
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
-index 514b829..a74a54b 100755
+index 203a4e2..c1b4b06 100755
--- a/configure.in
+++ b/configure.in
@@ -184,7 +184,7 @@ case "$withval" in
*)
if test -n "$withval" ; then
z_lib="`echo $withval |cut -f2 -d, -s`"
-- ZLIB=$z_lib"/libz."$LLEXT
-+ ZLIB="-lz"
- HAVE_ZLIB="yes"
+- ZLIB=$z_lib"/libz."$LLEXT
++ ZLIB="-lz"
+ HAVE_ZLIB="yes"
else
ZLIB=""
@@ -218,7 +218,7 @@ case "$withval" in
*)
if test -n "$withval" ; then
jpeg_lib="`echo $withval |cut -f2 -d, -s`"
-- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
-+ JPEGLIB="-ljpeg"
- dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]);
- HAVE_JPEG="yes"
+- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
++ JPEGLIB="-ljpeg"
+ dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]);
+ HAVE_JPEG="yes"
else
@@ -370,14 +370,14 @@ case "$withval" in
*)
- if test -n "$withval" ; then
- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
-- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
-+ HDF5LIB="-lhdf5"
- hdf5_inc="`echo $withval |cut -f1 -d,`"
- if test -n "$hdf5_inc"; then
- HDF5INC="$hdf5_inc"
- fi
- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
- if test -n "$hdf5_lib"; then
-- HDF5LIB=$hdf5_lib
-+ HDF5LIB="-lhdf5"
- fi
- HAVE_HDF5="yes"
- else
+ if test -n "$withval" ; then
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
++ HDF5LIB="-lhdf5"
+ hdf5_inc="`echo $withval |cut -f1 -d,`"
+ if test -n "$hdf5_inc"; then
+ HDF5INC="$hdf5_inc"
+ fi
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+ if test -n "$hdf5_lib"; then
+- HDF5LIB=$hdf5_lib
++ HDF5LIB="-lhdf5"
+ fi
+ HAVE_HDF5="yes"
+ else
@@ -387,7 +387,7 @@ case "$withval" in
- ;;
+ ;;
esac
if test -n "$HDF5LIB"; then
-- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
-+ LIBS="-lhdf5"
- HAVE_HDF5="yes"
+- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
++ LIBS="-lhdf5"
+ HAVE_HDF5="yes"
fi
AC_MSG_RESULT([$HAVE_HDF5])
@@ -400,7 +400,7 @@ dnl Check that the libraries that HDF4 needs have been found
@@ -62,9 +62,9 @@ index 514b829..a74a54b 100755
dnl
-if test -n "$HDF5LIB"; then
+if test -n "$HDF5LIB" -a -d "$HDF5LIB"; then
- AC_MSG_CHECKING([dependencies for HDF5 library])
- DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
- SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
+ AC_MSG_CHECKING([dependencies for HDF5 library])
+ DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
+ SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
diff --git a/native/hdf5lib/Makefile.in b/native/hdf5lib/Makefile.in
index 98da3ac..a4e9f91 100644
--- a/native/hdf5lib/Makefile.in
@@ -79,5 +79,5 @@ index 98da3ac..a4e9f91 100644
# Macro def: object filename used
OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o
--
-1.7.7
+1.7.7.6
diff --git a/0004-remove-writable-prefix-check.patch b/0004-remove-writable-prefix-check.patch
index 38af459..f876f5f 100644
--- a/0004-remove-writable-prefix-check.patch
+++ b/0004-remove-writable-prefix-check.patch
@@ -1,6 +1,6 @@
-From dfcf01f73b66209201604ba53042b57ebda36b44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Fri, 15 Jul 2011 09:11:50 +0200
+From 1f269a0a80d8c580a01616ac21b9036ecf26238a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:51:05 +0100
Subject: [PATCH 4/7] remove writable prefix check
---
@@ -8,31 +8,31 @@ Subject: [PATCH 4/7] remove writable prefix check
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
-index a74a54b..ab21e6b 100755
+index c1b4b06..c4a2fcb 100755
--- a/configure.in
+++ b/configure.in
-@@ -635,10 +635,6 @@ if test $JH45INST_FOUND -eq 1; then
- if test \( ! -d "$JH45INST" \); then
- JH45INST_FOUND=0
- fi
-- if test \( ! -w "$JH45INST" \); then
-- AC_MSG_ERROR( [ $JAVINST : not writable ])
-- JH45INST_FOUND=0
-- fi
+@@ -644,10 +644,6 @@ if test $JH45INST_FOUND -eq 1; then
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- AC_MSG_ERROR( [ $JAVINST : not writable ])
+- JH45INST_FOUND=0
+- fi
fi
until test $JH45INST_FOUND -eq 1; do
- echo "Please type the directory in which to install the JH45"
-@@ -647,10 +643,6 @@ until test $JH45INST_FOUND -eq 1; do
- if test \( ! -d "$JH45INST" \); then
- JH45INST_FOUND=0
- fi
-- if test \( ! -w "$JH45INST" \); then
-- AC_MSG_ERROR( [ $JAVINST : not writable ])
-- JH45INST_FOUND=0
-- fi
+ echo "Please type the directory in which to install the JH45"
+@@ -656,10 +652,6 @@ until test $JH45INST_FOUND -eq 1; do
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- AC_MSG_ERROR( [ $JAVINST : not writable ])
+- JH45INST_FOUND=0
+- fi
done
ac_cv_lib_JH45INST=$JH45INST
--
-1.7.7
+1.7.7.6
diff --git a/0005-update-config.sub-and-config.guess.patch b/0005-update-config.sub-and-config.guess.patch
index 33722f8..06b0d95 100644
--- a/0005-update-config.sub-and-config.guess.patch
+++ b/0005-update-config.sub-and-config.guess.patch
@@ -1,6 +1,6 @@
-From 276813dba19c467ac391525bdaed2fbd29a6be2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Thu, 14 Jul 2011 21:21:38 +0200
+From 6b97b6f9c2698bbe2fbf29174e0b04495ef05def Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:51:14 +0100
Subject: [PATCH 5/7] update config.sub and config.guess
---
@@ -3226,5 +3226,5 @@ index b87a32d..2a55a50 100755
+# time-stamp-end: "'"
+# End:
--
-1.7.7
+1.7.7.6
diff --git a/0006-clean-hdfview.sh.patch b/0006-clean-hdfview.sh.patch
index 178e5e2..deef054 100644
--- a/0006-clean-hdfview.sh.patch
+++ b/0006-clean-hdfview.sh.patch
@@ -1,6 +1,6 @@
-From c0e1c8443a6ee05f6a10508490fe363d4bc493ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Mon, 27 Jun 2011 21:58:51 +0200
+From ece74d71a8561a2261774794742db779dbcb7dfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:51:24 +0100
Subject: [PATCH 6/7] clean hdfview.sh
---
@@ -8,7 +8,7 @@ Subject: [PATCH 6/7] clean hdfview.sh
1 files changed, 10 insertions(+), 82 deletions(-)
diff --git a/bin/hdfview.sh.in b/bin/hdfview.sh.in
-index f590d86..5090b82 100755
+index 707ad3b..5090b82 100755
--- a/bin/hdfview.sh.in
+++ b/bin/hdfview.sh.in
@@ -1,92 +1,20 @@
@@ -111,9 +111,9 @@ index f590d86..5090b82 100755
-
export LD_LIBRARY_PATH
--$JAVAHOME/java -Xmx1000m -Djava.library.path=$LD_LIBRARY_PATH ncsa.hdf.view.HDFView -root $HDFJAVA $*
+-$JAVAHOME/java @JAVAX@ -Djava.library.path=$LD_LIBRARY_PATH ncsa.hdf.view.HDFView -root $HDFJAVA $*
+java -Xmx1000m ncsa.hdf.view.HDFView $*
+
--
-1.7.7
+1.7.7.6
diff --git a/0007-update-configure.patch b/0007-update-configure.patch
index 2e171e6..1e8844f 100644
--- a/0007-update-configure.patch
+++ b/0007-update-configure.patch
@@ -1,14 +1,14 @@
-From b119f0915148c525bc84c58edd934612518b8bd0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86 at gmail.com>
-Date: Fri, 15 Jul 2011 10:31:00 +0200
+From 24d3e8a66f895c52eb8ed934a21bb0d21c22de72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:51:39 +0100
Subject: [PATCH 7/7] update configure
---
- configure | 6133 +++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 3288 insertions(+), 2845 deletions(-)
+ configure | 6282 +++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 3363 insertions(+), 2919 deletions(-)
diff --git a/configure b/configure
-index 9e30023..e6012e6 100755
+index 828f8a0..60d5f67 100755
--- a/configure
+++ b/configure
@@ -1,81 +1,423 @@
@@ -60,6 +60,8 @@ index 9e30023..e6012e6 100755
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
+-else
+- as_unset=false
+
+as_nl='
+'
@@ -77,8 +79,7 @@ index 9e30023..e6012e6 100755
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
- else
-- as_unset=false
++else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
@@ -325,7 +326,9 @@ index 9e30023..e6012e6 100755
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-+
+
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -418,9 +421,7 @@ index 9e30023..e6012e6 100755
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -445,14 +446,15 @@ index 9e30023..e6012e6 100755
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
@@ -528,21 +530,21 @@ index 9e30023..e6012e6 100755
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
- done
-done
-;;
@@ -601,7 +603,7 @@ index 9e30023..e6012e6 100755
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
+-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
@@ -702,7 +704,7 @@ index 9e30023..e6012e6 100755
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
--IFS=" $as_nl"
+-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
@@ -738,7 +740,7 @@ index 9e30023..e6012e6 100755
# Identity of this package.
PACKAGE_NAME=
-@@ -270,52 +560,181 @@ PACKAGE_TARNAME=
+@@ -270,52 +560,183 @@ PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
@@ -795,7 +797,7 @@ index 9e30023..e6012e6 100755
# 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 AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP RM FIND build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ZLIB JPEGLIB SZLIB HDF4LIB HDF5LIB LIBH45 jdkclasses JAVALIB javabin JAVA JAVAC JAVADOC JAR LD LDOPT LDOPT2 LLEXT SLEXT JSLEXT COPT COPTNOSHARE JAVABIN JAVAINC JAVAINC2 HDF5INC HDF4INC H45LIB H45INC TARGET JAVATARG CLASSPATH JH45INST JHVINST JH5INST VERSSTRING 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 AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP RM FIND build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ZLIB JPEGLIB SZLIB HDF4LIB HDF5LIB LIBH45 jdkclasses JAVALIB javabin JAVA JAVAC JAVADOC JAR LD LDOPT LDOPT2 LLEXT SLEXT JSLEXT COPT COPTNOSHARE JAVABIN JAVAX JAVAINC JAVAINC2 HDF5INC HDF4INC H45LIB H45INC TARGET JAVATARG CLASSPATH JH45INST JHVINST JH5INST VERSSTRING LIBOBJS LTLIBOBJS'
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+VERSSTRING
@@ -811,6 +813,7 @@ index 9e30023..e6012e6 100755
+HDF5INC
+JAVAINC2
+JAVAINC
++JAVAX
+JAVABIN
+COPTNOSHARE
+COPT
@@ -911,6 +914,7 @@ index 9e30023..e6012e6 100755
+with_h4toh5
+with_jdkclasses
+with_jdk
++with_javax
+with_javabin
+with_jhdf4
+with_jhdf5
@@ -934,7 +938,7 @@ index 9e30023..e6012e6 100755
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
-@@ -338,34 +757,49 @@ x_libraries=NONE
+@@ -338,34 +759,49 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
@@ -991,7 +995,7 @@ index 9e30023..e6012e6 100755
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -387,33 +821,59 @@ do
+@@ -387,33 +823,59 @@ do
--config-cache | -C)
cache_file=config.cache ;;
@@ -1069,7 +1073,7 @@ index 9e30023..e6012e6 100755
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -440,6 +900,12 @@ do
+@@ -440,6 +902,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -1082,7 +1086,7 @@ index 9e30023..e6012e6 100755
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -464,13 +930,16 @@ do
+@@ -464,13 +932,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -1103,7 +1107,7 @@ index 9e30023..e6012e6 100755
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -535,6 +1004,16 @@ do
+@@ -535,6 +1006,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -1120,7 +1124,7 @@ index 9e30023..e6012e6 100755
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -585,26 +1064,36 @@ do
+@@ -585,26 +1066,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
@@ -1172,7 +1176,7 @@ index 9e30023..e6012e6 100755
--x)
# Obsolete; use --with-x.
-@@ -624,27 +1113,26 @@ do
+@@ -624,27 +1115,26 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1210,7 +1214,7 @@ index 9e30023..e6012e6 100755
;;
esac
-@@ -652,31 +1140,36 @@ done
+@@ -652,31 +1142,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1238,7 +1242,7 @@ index 9e30023..e6012e6 100755
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
+- localstatedir libdir includedir oldincludedir infodir mandir
+# Check all directory arguments for consistency.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
@@ -1265,7 +1269,7 @@ index 9e30023..e6012e6 100755
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -690,8 +1183,8 @@ target=$target_alias
+@@ -690,8 +1185,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -1276,7 +1280,7 @@ index 9e30023..e6012e6 100755
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -703,74 +1196,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+@@ -703,74 +1198,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
test "$silent" = yes && exec 6>/dev/null
@@ -1294,16 +1298,16 @@ index 9e30023..e6012e6 100755
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$0" : 'X\(//\)[^/]' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
+- X"$0" : 'X\(//\)[^/]' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
-echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -1344,18 +1348,7 @@ index 9e30023..e6012e6 100755
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-+ pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+ srcdir=.
- fi
+-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
- { (exit 1); exit 1; }; }
@@ -1392,6 +1385,18 @@ index 9e30023..e6012e6 100755
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
++if test ! -r "$srcdir/$ac_unique_file"; then
++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
++ pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++ srcdir=.
++fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
@@ -1407,7 +1412,7 @@ index 9e30023..e6012e6 100755
#
# Report the --help message.
-@@ -793,20 +1284,17 @@ Configuration:
+@@ -793,20 +1286,17 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -1423,15 +1428,15 @@ index 9e30023..e6012e6 100755
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
+- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [PREFIX]
+- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -816,18 +1304,25 @@ for instance \`--prefix=\$HOME'.
+@@ -816,18 +1306,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
@@ -1469,7 +1474,7 @@ index 9e30023..e6012e6 100755
_ACEOF
cat <<\_ACEOF
-@@ -863,158 +1358,415 @@ Some influential environment variables:
+@@ -864,169 +1361,426 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -1560,7 +1565,13 @@ index 9e30023..e6012e6 100755
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
--esac
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
@@ -1578,15 +1589,8 @@ index 9e30023..e6012e6 100755
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
+-esac
+-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
@@ -1596,9 +1600,11 @@ index 9e30023..e6012e6 100755
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
+- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
@@ -1655,6 +1661,12 @@ index 9e30023..e6012e6 100755
-## --------- ##
-## Platform. ##
-## --------- ##
+-
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
@@ -1681,20 +1693,13 @@ index 9e30023..e6012e6 100755
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
--hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
--uname -m = `(uname -m) 2>/dev/null || echo unknown`
--uname -r = `(uname -r) 2>/dev/null || echo unknown`
--uname -s = `(uname -s) 2>/dev/null || echo unknown`
--uname -v = `(uname -v) 2>/dev/null || echo unknown`
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
--/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
--/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-+} # ac_fn_c_try_compile
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -1702,6 +1707,9 @@ index 9e30023..e6012e6 100755
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
++} # ac_fn_c_try_compile
+
+-_ASUNAME
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1732,14 +1740,22 @@ index 9e30023..e6012e6 100755
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
--_ASUNAME
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- echo "PATH: $as_dir"
+-done
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-+
+
+-} >&5
+} # ac_fn_c_try_cpp
-+
+
+-cat >&5 <<_ACEOF
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -1773,15 +1789,19 @@ index 9e30023..e6012e6 100755
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-+
+
+-## ----------- ##
+-## Core tests. ##
+-## ----------- ##
+} # ac_fn_c_try_run
-+
+
+-_ACEOF
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1980,21 +2000,30 @@ index 9e30023..e6012e6 100755
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
-
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- echo "PATH: $as_dir"
--done
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
+ $as_echo "PATH: $as_dir"
+ done
+IFS=$as_save_IFS
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++## ----------- ##
++## Core tests. ##
++## ----------- ##
++
++_ACEOF
- } >&5
-@@ -1036,7 +1788,6 @@ _ACEOF
+ # Keep a trace of the command line.
+@@ -1037,7 +1791,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -2002,11 +2031,11 @@ index 9e30023..e6012e6 100755
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1047,13 +1798,13 @@ do
+@@ -1048,126 +1801,137 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*)
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -2018,11 +2047,31 @@ index 9e30023..e6012e6 100755
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+- ac_must_keep_next=false # Got value, back to normal.
++ ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1069,104 +1820,115 @@ do
- -* ) ac_must_keep_next=true ;;
- esac
+- case $ac_arg in
+- *=* | --config-cache | -C | -disable-* | --disable-* \
+- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+- | -with-* | --with-* | -without-* | --without-* | --x)
+- case "$ac_configure_args0 " in
+- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+- esac
+- ;;
+- -* ) ac_must_keep_next=true ;;
+- esac
++ case $ac_arg in
++ *=* | --config-cache | -C | -disable-* | --disable-* \
++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++ | -with-* | --with-* | -without-* | --without-* | --x)
++ case "$ac_configure_args0 " in
++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++ esac
++ ;;
++ -* ) ac_must_keep_next=true ;;
++ esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
@@ -2081,15 +2130,15 @@ index 9e30023..e6012e6 100755
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
@@ -2131,8 +2180,8 @@ index 9e30023..e6012e6 100755
echo
for ac_var in $ac_subst_files
do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
@@ -2184,7 +2233,7 @@ index 9e30023..e6012e6 100755
# Predefined preprocessor variables.
-@@ -1174,112 +1936,137 @@ cat >>confdefs.h <<_ACEOF
+@@ -1175,112 +1939,137 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
@@ -2288,7 +2337,7 @@ index 9e30023..e6012e6 100755
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
@@ -2312,13 +2361,13 @@ index 9e30023..e6012e6 100755
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
-- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
-- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
-- ac_cache_corrupted=:
+- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
@@ -2340,7 +2389,7 @@ index 9e30023..e6012e6 100755
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
@@ -2370,7 +2419,7 @@ index 9e30023..e6012e6 100755
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -1288,69 +2075,54 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+@@ -1289,69 +2078,54 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -2420,7 +2469,7 @@ index 9e30023..e6012e6 100755
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
@@ -2428,11 +2477,11 @@ index 9e30023..e6012e6 100755
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-+
-
-echo "$as_me:$LINENO: checking if tr works" >&5
-echo $ECHO_N "checking if tr works... $ECHO_C" >&6
++
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tr works" >&5
+$as_echo_n "checking if tr works... " >&6; }
TR_TEST="`echo Test | tr 'a-z,' 'A-Z '`"
@@ -2463,7 +2512,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -1360,31 +2132,33 @@ for as_dir in $PATH
+@@ -1361,31 +2135,33 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2507,18 +2556,18 @@ index 9e30023..e6012e6 100755
yyy_ok="yes"
yyy_option="$*"
for yyy_option
-@@ -1395,8 +2169,8 @@ do
- if test "$yyy_opt" != "$zzz_opt"; then
- yyy_optarg=`expr "x$yyy_option" : 'x[^=]*=\(.*\)'`
- if test -z "$yyy_optarg"; then
-- echo "$as_me:$LINENO: result: option $yyy_option too long, configure will fail" >&5
+@@ -1396,8 +2172,8 @@ do
+ if test "$yyy_opt" != "$zzz_opt"; then
+ yyy_optarg=`expr "x$yyy_option" : 'x[^=]*=\(.*\)'`
+ if test -z "$yyy_optarg"; then
+- echo "$as_me:$LINENO: result: option $yyy_option too long, configure will fail" >&5
-echo "${ECHO_T}option $yyy_option too long, configure will fail" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: option $yyy_option too long, configure will fail" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: option $yyy_option too long, configure will fail" >&5
+$as_echo "option $yyy_option too long, configure will fail" >&6; }
- yyy_ok="no"
- fi
- fi
-@@ -1404,12 +2178,10 @@ echo "${ECHO_T}option $yyy_option too long, configure will fail" >&6
+ yyy_ok="no"
+ fi
+ fi
+@@ -1405,12 +2181,10 @@ echo "${ECHO_T}option $yyy_option too long, configure will fail" >&6
done
if test "$yyy_ok" != "yes"; then
echo $yyy_ok
@@ -2534,7 +2583,7 @@ index 9e30023..e6012e6 100755
fi
ac_ext=c
-@@ -1420,10 +2192,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1421,10 +2195,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2549,7 +2598,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1433,35 +2205,37 @@ for as_dir in $PATH
+@@ -1434,35 +2208,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2599,7 +2648,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1471,39 +2245,50 @@ for as_dir in $PATH
+@@ -1472,39 +2248,50 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2665,7 +2714,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1513,77 +2298,37 @@ for as_dir in $PATH
+@@ -1514,77 +2301,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2689,11 +2738,15 @@ index 9e30023..e6012e6 100755
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
@@ -2727,15 +2780,11 @@ index 9e30023..e6012e6 100755
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
+-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-fi
+-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
@@ -2757,7 +2806,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1594,18 +2339,19 @@ for as_dir in $PATH
+@@ -1595,18 +2342,19 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2781,7 +2830,7 @@ index 9e30023..e6012e6 100755
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -1623,24 +2369,25 @@ fi
+@@ -1624,24 +2372,25 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2816,7 +2865,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1650,39 +2397,41 @@ for as_dir in $PATH
+@@ -1651,39 +2400,41 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2871,7 +2920,7 @@ index 9e30023..e6012e6 100755
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1692,66 +2441,78 @@ for as_dir in $PATH
+@@ -1693,66 +2444,78 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2986,7 +3035,7 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
int
-@@ -1763,112 +2524,108 @@ main ()
+@@ -1764,112 +2527,108 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -3000,21 +3049,10 @@ index 9e30023..e6012e6 100755
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
@@ -3036,7 +3074,18 @@ index 9e30023..e6012e6 100755
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
-+ ac_status=$?
+ ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- # Find the output, starting from the most likely. This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
@@ -3049,21 +3098,26 @@ index 9e30023..e6012e6 100755
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-- ;;
+- ;;
- conftest.$ac_ext )
-- # This is the source file.
+- # This is the source file.
+- ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- ;;
++ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+- # We found the default executable, but exeext='' is most
+- # certainly right.
+- break;;
++ # We found the default executable, but exeext='' is most
++ # certainly right.
++ break;;
*.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
+- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- # FIXME: I believe we export ac_cv_exeext for Libtool,
+- # but it would be cool to find out if it's true. Does anybody
+- # maintain Libtool? --akim.
+- export ac_cv_exeext
+- break;;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
@@ -3073,9 +3127,10 @@ index 9e30023..e6012e6 100755
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
- break;;
++ break;;
* )
- break;;
+- break;;
++ break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
@@ -3128,9 +3183,9 @@ index 9e30023..e6012e6 100755
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
+- cross_compiling=yes
- else
-- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
@@ -3175,15 +3230,16 @@ index 9e30023..e6012e6 100755
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -1876,88 +2633,141 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -1877,88 +2636,141 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
+- export ac_cv_exeext
+- break;;
++ break;;
* ) break;;
esac
done
@@ -3269,6 +3325,7 @@ index 9e30023..e6012e6 100755
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+-fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
@@ -3294,7 +3351,7 @@ index 9e30023..e6012e6 100755
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
@@ -3371,7 +3428,7 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
int
-@@ -1971,55 +2781,34 @@ main ()
+@@ -1972,55 +2784,34 @@ main ()
return 0;
}
_ACEOF
@@ -3384,14 +3441,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -3428,16 +3485,17 @@ index 9e30023..e6012e6 100755
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if ${ac_cv_prog_cc_g+:} false; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if ${ac_cv_prog_cc_g+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
@@ -3446,7 +3504,7 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
int
-@@ -2030,39 +2819,49 @@ main ()
+@@ -2031,39 +2822,49 @@ main ()
return 0;
}
_ACEOF
@@ -3459,14 +3517,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -3524,7 +3582,7 @@ index 9e30023..e6012e6 100755
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -2078,18 +2877,14 @@ else
+@@ -2079,18 +2880,14 @@ else
CFLAGS=
fi
fi
@@ -3549,7 +3607,7 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -2117,12 +2912,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
+@@ -2118,12 +2915,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -3569,17 +3627,17 @@ index 9e30023..e6012e6 100755
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -2137,205 +2937,37 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+@@ -2138,205 +2940,37 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
@@ -3594,14 +3652,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -3665,14 +3723,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -3711,14 +3769,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -3756,14 +3814,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -3794,7 +3852,7 @@ index 9e30023..e6012e6 100755
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2343,32 +2975,34 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+@@ -2344,32 +2978,34 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3813,7 +3871,7 @@ index 9e30023..e6012e6 100755
cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
all:
-- @echo 'ac_maketemp="$(MAKE)"'
+- @echo 'ac_maketemp="$(MAKE)"'
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
@@ -3847,7 +3905,7 @@ index 9e30023..e6012e6 100755
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2385,22 +3019,23 @@ fi
+@@ -2386,22 +3022,23 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -3879,21 +3937,34 @@ index 9e30023..e6012e6 100755
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2408,7 +3043,7 @@ case $as_dir/ in
+@@ -2409,40 +3046,53 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+- if test $ac_prog = install &&
+- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+- # AIX install. It has an incompatible calling convention.
+- :
+- elif test $ac_prog = install &&
+- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+- # program-specific install script used by HP pwplus--don't use.
+- :
+- else
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
+- fi
+- fi
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -2418,30 +3053,43 @@ case $as_dir/ in
- # program-specific install script used by HP pwplus--don't use.
- :
- else
-- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-- break 3
++ if test $ac_prog = install &&
++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ :
++ elif test $ac_prog = install &&
++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++ # program-specific install script used by HP pwplus--don't use.
++ :
++ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
@@ -3906,8 +3977,8 @@ index 9e30023..e6012e6 100755
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
- fi
- fi
++ fi
++ fi
done
done
;;
@@ -3940,7 +4011,7 @@ index 9e30023..e6012e6 100755
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2458,15 +3106,15 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -2459,15 +3109,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3960,7 +4031,7 @@ index 9e30023..e6012e6 100755
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2480,11 +3128,7 @@ do
+@@ -2481,91 +3131,43 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3973,9 +4044,11 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2493,78 +3137,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #else
+ # include <assert.h>
#endif
- Syntax error
+- Syntax error
++ Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4061,7 +4134,7 @@ index 9e30023..e6012e6 100755
break
fi
-@@ -2576,8 +3176,8 @@ fi
+@@ -2577,8 +3179,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -4072,7 +4145,7 @@ index 9e30023..e6012e6 100755
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -2587,11 +3187,7 @@ do
+@@ -2588,98 +3190,49 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4085,9 +4158,11 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -2600,85 +3196,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #else
+ # include <assert.h>
#endif
- Syntax error
+- Syntax error
++ Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4185,7 +4260,7 @@ index 9e30023..e6012e6 100755
fi
ac_ext=c
-@@ -2688,31 +3239,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+@@ -2689,31 +3242,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4317,13 +4392,13 @@ index 9e30023..e6012e6 100755
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
++fi
++
++ fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-+
-+ fi
-+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
@@ -4347,7 +4422,7 @@ index 9e30023..e6012e6 100755
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -2727,51 +3389,23 @@ main ()
+@@ -2728,51 +3392,23 @@ main ()
return 0;
}
_ACEOF
@@ -4360,14 +4435,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -4405,7 +4480,7 @@ index 9e30023..e6012e6 100755
else
ac_cv_header_stdc=no
fi
-@@ -2781,18 +3415,14 @@ fi
+@@ -2782,18 +3418,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4427,7 +4502,7 @@ index 9e30023..e6012e6 100755
else
ac_cv_header_stdc=no
fi
-@@ -2802,16 +3432,13 @@ fi
+@@ -2803,24 +3435,21 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4447,12 +4522,25 @@ index 9e30023..e6012e6 100755
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -2831,110 +3458,66 @@ main ()
+ #else
+ # define ISLOWER(c) \
+- (('a' <= (c) && (c) <= 'i') \
+- || ('j' <= (c) && (c) <= 'r') \
+- || ('s' <= (c) && (c) <= 'z'))
++ (('a' <= (c) && (c) <= 'i') \
++ || ('j' <= (c) && (c) <= 'r') \
++ || ('s' <= (c) && (c) <= 'z'))
+ # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+ #endif
+
+@@ -2831,111 +3460,67 @@ main ()
+ int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
++ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
}
@@ -4548,14 +4636,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -4585,7 +4673,7 @@ index 9e30023..e6012e6 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
-@@ -2945,72 +3528,43 @@ fi
+@@ -2946,72 +3531,43 @@ fi
if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
@@ -4637,14 +4725,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -4674,7 +4762,7 @@ index 9e30023..e6012e6 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
-@@ -3025,10 +3579,10 @@ fi
+@@ -3026,10 +3582,10 @@ fi
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
@@ -4689,7 +4777,7 @@ index 9e30023..e6012e6 100755
else
case $RM in
[\\/]* | ?:[\\/]*)
-@@ -3040,35 +3594,36 @@ for as_dir in $PATH
+@@ -3041,35 +3597,36 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4739,7 +4827,7 @@ index 9e30023..e6012e6 100755
else
case $FIND in
[\\/]* | ?:[\\/]*)
-@@ -3080,104 +3635,133 @@ for as_dir in $PATH
+@@ -3081,104 +3638,133 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4782,18 +4870,12 @@ index 9e30023..e6012e6 100755
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
- { (exit 1); exit 1; }; }
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
+-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
-+if ${ac_cv_build+:} false; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
@@ -4805,6 +4887,18 @@ index 9e30023..e6012e6 100755
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
++$as_echo_n "checking build system type... " >&6; }
++if ${ac_cv_build+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
@@ -4812,10 +4906,8 @@ index 9e30023..e6012e6 100755
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
@@ -4938,7 +5030,7 @@ index 9e30023..e6012e6 100755
# The aliases save the names the user supplied, while $host etc.
-@@ -3186,9 +3770,16 @@ test -n "$target_alias" &&
+@@ -3187,9 +3773,16 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@@ -4955,7 +5047,7 @@ index 9e30023..e6012e6 100755
alpha-dec-osf*.*) TARGETLIB="alpha"
LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
LLEXT="a";
-@@ -3249,17 +3840,17 @@ TARGETLIB="$target"
+@@ -3250,17 +3843,17 @@ TARGETLIB="$target"
esac
@@ -4979,27 +5071,27 @@ index 9e30023..e6012e6 100755
case "$withval" in
yes)
-@@ -3273,7 +3864,7 @@ case "$withval" in
+@@ -3274,7 +3867,7 @@ case "$withval" in
*)
if test -n "$withval" ; then
z_lib="`echo $withval |cut -f2 -d, -s`"
-- ZLIB=$z_lib"/libz."$LLEXT
-+ ZLIB="-lz"
- HAVE_ZLIB="yes"
+- ZLIB=$z_lib"/libz."$LLEXT
++ ZLIB="-lz"
+ HAVE_ZLIB="yes"
else
ZLIB=""
-@@ -3285,24 +3876,24 @@ if test -n "$ZLIB"; then
- LIBS="$LIBS $ZLIB"
- HAVE_ZLIB="yes"
+@@ -3286,24 +3879,24 @@ if test -n "$ZLIB"; then
+ LIBS="$LIBS $ZLIB"
+ HAVE_ZLIB="yes"
fi
-echo "$as_me:$LINENO: result: $HAVE_ZLIB" >&5
-echo "${ECHO_T}$HAVE_ZLIB" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_ZLIB" >&5
+$as_echo "$HAVE_ZLIB" >&6; }
if test $HAVE_ZLIB = "yes"; then
-- echo "$as_me:$LINENO: result: zlib found: $ZLIB" >&5
+- echo "$as_me:$LINENO: result: zlib found: $ZLIB" >&5
-echo "${ECHO_T}zlib found: $ZLIB" >&6;
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: zlib found: $ZLIB" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: zlib found: $ZLIB" >&5
+$as_echo "zlib found: $ZLIB" >&6; };
fi
@@ -5023,27 +5115,27 @@ index 9e30023..e6012e6 100755
case "$withval" in
yes)
-@@ -3315,7 +3906,7 @@ case "$withval" in
+@@ -3316,7 +3909,7 @@ case "$withval" in
*)
if test -n "$withval" ; then
jpeg_lib="`echo $withval |cut -f2 -d, -s`"
-- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
-+ JPEGLIB="-ljpeg"
- HAVE_JPEG="yes"
+- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
++ JPEGLIB="-ljpeg"
+ HAVE_JPEG="yes"
else
- HAVE_JPEG="no"
-@@ -3326,24 +3917,24 @@ if test -n "$JPEGLIB"; then
- LIBS="$LIBS $JPEGLIB"
- HAVE_JPEG="yes"
+ HAVE_JPEG="no"
+@@ -3327,24 +3920,24 @@ if test -n "$JPEGLIB"; then
+ LIBS="$LIBS $JPEGLIB"
+ HAVE_JPEG="yes"
fi
-echo "$as_me:$LINENO: result: $HAVE_JPEG" >&5
-echo "${ECHO_T}$HAVE_JPEG" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_JPEG" >&5
+$as_echo "$HAVE_JPEG" >&6; }
if test $HAVE_JPEG = "yes"; then
-- echo "$as_me:$LINENO: result: jpeg found: $JPEGLIB" >&5
+- echo "$as_me:$LINENO: result: jpeg found: $JPEGLIB" >&5
-echo "${ECHO_T}jpeg found: $JPEGLIB" >&6;
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: jpeg found: $JPEGLIB" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: jpeg found: $JPEGLIB" >&5
+$as_echo "jpeg found: $JPEGLIB" >&6; };
fi
@@ -5067,18 +5159,27 @@ index 9e30023..e6012e6 100755
case "$withval" in
yes)
-@@ -3369,24 +3960,24 @@ if test -n "$SZLIB"; then
- LIBS="$LIBS $SZLIB"
- HAVE_SZIP="yes"
+@@ -3358,7 +3951,7 @@ case "$withval" in
+ *)
+ if test -n "$withval" ; then
+ sz_lib="`echo $withval |cut -f2 -d, -s`"
+- SZLIB=$sz_lib"/libsz."$LLEXT
++ SZLIB=$sz_lib"/libszip."$LLEXT
+ HAVE_SZIP="yes"
+ else
+ SZLIB=""
+@@ -3370,24 +3963,24 @@ if test -n "$SZLIB"; then
+ LIBS="$LIBS $SZLIB"
+ HAVE_SZIP="yes"
fi
-echo "$as_me:$LINENO: result: $HAVE_SZIP" >&5
-echo "${ECHO_T}$HAVE_SZIP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_SZIP" >&5
+$as_echo "$HAVE_SZIP" >&6; }
if test $HAVE_SZIP = "yes"; then
-- echo "$as_me:$LINENO: result: szlib found: $SZLIB" >&5
+- echo "$as_me:$LINENO: result: szlib found: $SZLIB" >&5
-echo "${ECHO_T}szlib found: $SZLIB" >&6;
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: szlib found: $SZLIB" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: szlib found: $SZLIB" >&5
+$as_echo "szlib found: $SZLIB" >&6; };
fi
@@ -5102,63 +5203,63 @@ index 9e30023..e6012e6 100755
case "$withval" in
yes)
-@@ -3418,44 +4009,38 @@ if test -n "$HDF4LIB"; then
- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
- HAVE_HDF4="yes"
+@@ -3419,44 +4012,38 @@ if test -n "$HDF4LIB"; then
+ LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
+ HAVE_HDF4="yes"
fi
-echo "$as_me:$LINENO: result: $HAVE_HDF4" >&5
-echo "${ECHO_T}$HAVE_HDF4" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_HDF4" >&5
+$as_echo "$HAVE_HDF4" >&6; }
if test $HAVE_HDF4 = "yes"; then
-- echo "$as_me:$LINENO: result: HDF4 found: $HDF4LIB" >&5
+- echo "$as_me:$LINENO: result: HDF4 found: $HDF4LIB" >&5
-echo "${ECHO_T}HDF4 found: $HDF4LIB" >&6;
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: HDF4 found: $HDF4LIB" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: HDF4 found: $HDF4LIB" >&5
+$as_echo "HDF4 found: $HDF4LIB" >&6; };
fi
if test "$HAVE_HDF4" = "yes"; then
-- echo "$as_me:$LINENO: checking dependencies for HDF4 library" >&5
+- echo "$as_me:$LINENO: checking dependencies for HDF4 library" >&5
-echo $ECHO_N "checking dependencies for HDF4 library... $ECHO_C" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependencies for HDF4 library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependencies for HDF4 library" >&5
+$as_echo_n "checking dependencies for HDF4 library... " >&6; }
- needjpg=`grep 'define H4_HAVE_LIBJPEG 1' $HDF4INC/h4config.h`
- needgzip=`grep 'define H4_HAVE_LIBZ 1' $HDF4INC/h4config.h`
- needszip=`grep 'define H4_HAVE_LIBSZ 1' $HDF4INC/h4config.h`
- if test -n "$needjpg"; then
- if test "$HAVE_JPEG" != "yes"; then
-- { { echo "$as_me:$LINENO: error: HDF4 library needs JPEG, JPEG not defined." >&5
+ needjpg=`grep 'define H4_HAVE_LIBJPEG 1' $HDF4INC/h4config.h`
+ needgzip=`grep 'define H4_HAVE_LIBZ 1' $HDF4INC/h4config.h`
+ needszip=`grep 'define H4_HAVE_LIBSZ 1' $HDF4INC/h4config.h`
+ if test -n "$needjpg"; then
+ if test "$HAVE_JPEG" != "yes"; then
+- { { echo "$as_me:$LINENO: error: HDF4 library needs JPEG, JPEG not defined." >&5
-echo "$as_me: error: HDF4 library needs JPEG, JPEG not defined." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? " HDF4 library needs JPEG, JPEG not defined." "$LINENO" 5
- fi
- fi
++ as_fn_error $? " HDF4 library needs JPEG, JPEG not defined." "$LINENO" 5
+ fi
+ fi
- if test -n "$needgzip"; then
- if test "$HAVE_ZLIB" != "yes"; then
-- { { echo "$as_me:$LINENO: error: HDF4 library needs GZIP, GZIP not defined." >&5
+ if test -n "$needgzip"; then
+ if test "$HAVE_ZLIB" != "yes"; then
+- { { echo "$as_me:$LINENO: error: HDF4 library needs GZIP, GZIP not defined." >&5
-echo "$as_me: error: HDF4 library needs GZIP, GZIP not defined." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? " HDF4 library needs GZIP, GZIP not defined." "$LINENO" 5
- fi
- fi
++ as_fn_error $? " HDF4 library needs GZIP, GZIP not defined." "$LINENO" 5
+ fi
+ fi
- if test -n "$needszip"; then
- if test "$HAVE_SZIP" != "yes"; then
-- { { echo "$as_me:$LINENO: error: HDF4 library needs SZIP, SZIP not defined." >&5
+ if test -n "$needszip"; then
+ if test "$HAVE_SZIP" != "yes"; then
+- { { echo "$as_me:$LINENO: error: HDF4 library needs SZIP, SZIP not defined." >&5
-echo "$as_me: error: HDF4 library needs SZIP, SZIP not defined." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? " HDF4 library needs SZIP, SZIP not defined." "$LINENO" 5
- fi
- fi
-- echo "$as_me:$LINENO: result: OK" >&5
++ as_fn_error $? " HDF4 library needs SZIP, SZIP not defined." "$LINENO" 5
+ fi
+ fi
+- echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "OK" >&6; }
fi
-@@ -3463,17 +4048,17 @@ ac_cv_lib_HDF4=$HDF4LIB
+@@ -3464,17 +4051,17 @@ ac_cv_lib_HDF4=$HDF4LIB
ac_cv_lib_HDF4INC=$HDF4INC
@@ -5182,71 +5283,71 @@ index 9e30023..e6012e6 100755
case "$withval" in
yes)
-@@ -3487,14 +4072,14 @@ case "$withval" in
+@@ -3488,14 +4075,14 @@ case "$withval" in
*)
- if test -n "$withval" ; then
- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
-- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
-+ HDF5LIB="-lhdf5"
- hdf5_inc="`echo $withval |cut -f1 -d,`"
- if test -n "$hdf5_inc"; then
- HDF5INC="$hdf5_inc"
- fi
- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
- if test -n "$hdf5_lib"; then
-- HDF5LIB=$hdf5_lib
-+ HDF5LIB="-lhdf5"
- fi
- HAVE_HDF5="yes"
- else
-@@ -3504,56 +4089,52 @@ case "$withval" in
- ;;
+ if test -n "$withval" ; then
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
++ HDF5LIB="-lhdf5"
+ hdf5_inc="`echo $withval |cut -f1 -d,`"
+ if test -n "$hdf5_inc"; then
+ HDF5INC="$hdf5_inc"
+ fi
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+ if test -n "$hdf5_lib"; then
+- HDF5LIB=$hdf5_lib
++ HDF5LIB="-lhdf5"
+ fi
+ HAVE_HDF5="yes"
+ else
+@@ -3505,56 +4092,52 @@ case "$withval" in
+ ;;
esac
if test -n "$HDF5LIB"; then
-- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
-+ LIBS="-lhdf5"
- HAVE_HDF5="yes"
+- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
++ LIBS="-lhdf5"
+ HAVE_HDF5="yes"
fi
-echo "$as_me:$LINENO: result: $HAVE_HDF5" >&5
-echo "${ECHO_T}$HAVE_HDF5" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_HDF5" >&5
+$as_echo "$HAVE_HDF5" >&6; }
if test $HAVE_HDF5 = "yes"; then
-- echo "$as_me:$LINENO: result: HDF5 found: $HDF5LIB" >&5
+- echo "$as_me:$LINENO: result: HDF5 found: $HDF5LIB" >&5
-echo "${ECHO_T}HDF5 found: $HDF5LIB" >&6;
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: HDF5 found: $HDF5LIB" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: HDF5 found: $HDF5LIB" >&5
+$as_echo "HDF5 found: $HDF5LIB" >&6; };
fi
-if test -n "$HDF5LIB"; then
-- echo "$as_me:$LINENO: checking dependencies for HDF5 library" >&5
+- echo "$as_me:$LINENO: checking dependencies for HDF5 library" >&5
-echo $ECHO_N "checking dependencies for HDF5 library... $ECHO_C" >&6
+if test -n "$HDF5LIB" -a -d "$HDF5LIB"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependencies for HDF5 library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependencies for HDF5 library" >&5
+$as_echo_n "checking dependencies for HDF5 library... " >&6; }
- DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
- SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
- if test -n "$DFL";
- then
- if test "$HAVE_ZLIB" != "yes"; then
-- { { echo "$as_me:$LINENO: error: HDF5 library needs GZIP, GZIP not defined." >&5
+ DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
+ SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
+ if test -n "$DFL";
+ then
+ if test "$HAVE_ZLIB" != "yes"; then
+- { { echo "$as_me:$LINENO: error: HDF5 library needs GZIP, GZIP not defined." >&5
-echo "$as_me: error: HDF5 library needs GZIP, GZIP not defined." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? " HDF5 library needs GZIP, GZIP not defined." "$LINENO" 5
- fi
- fi
- if test -n "$SZP";
- then
- if test "$HAVE_SZIP" != "yes"; then
-- { { echo "$as_me:$LINENO: error: HDF5 library needs SZIP, SZIP not defined." >&5
++ as_fn_error $? " HDF5 library needs GZIP, GZIP not defined." "$LINENO" 5
+ fi
+ fi
+ if test -n "$SZP";
+ then
+ if test "$HAVE_SZIP" != "yes"; then
+- { { echo "$as_me:$LINENO: error: HDF5 library needs SZIP, SZIP not defined." >&5
-echo "$as_me: error: HDF5 library needs SZIP, SZIP not defined." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? " HDF5 library needs SZIP, SZIP not defined." "$LINENO" 5
- fi
- fi
-- echo "$as_me:$LINENO: result: OK" >&5
++ as_fn_error $? " HDF5 library needs SZIP, SZIP not defined." "$LINENO" 5
+ fi
+ fi
+- echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "OK" >&6; }
fi
ac_cv_lib_HDF5=$HDF5LIB
@@ -5273,8 +5374,8 @@ index 9e30023..e6012e6 100755
-fi;
case "$withval" in
yes)
- USEH45="no"
-@@ -3573,70 +4154,15 @@ case "$withval" in
+ USEH45="no"
+@@ -3574,70 +4157,15 @@ case "$withval" in
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -5288,7 +5389,7 @@ index 9e30023..e6012e6 100755
-
-
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -5315,14 +5416,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -5340,6 +5441,7 @@ index 9e30023..e6012e6 100755
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
@@ -5351,7 +5453,7 @@ index 9e30023..e6012e6 100755
_ACEOF
fi
-@@ -3644,157 +4170,17 @@ fi
+@@ -3645,157 +4173,17 @@ fi
done
@@ -5389,14 +5491,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -5514,7 +5616,7 @@ index 9e30023..e6012e6 100755
fi
done
-@@ -3806,72 +4192,43 @@ done
+@@ -3807,72 +4195,43 @@ done
HDF45LIB="$hdf45_lib"
saved_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$hdf45_lib"
@@ -5566,14 +5668,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -5603,7 +5705,7 @@ index 9e30023..e6012e6 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBH4TOH5 1
_ACEOF
-@@ -3880,26 +4237,22 @@ _ACEOF
+@@ -3881,26 +4240,22 @@ _ACEOF
else
LDFLAGS="$saved_LDFLAGS"
@@ -5614,12 +5716,12 @@ index 9e30023..e6012e6 100755
fi
else
-- { { echo "$as_me:$LINENO: error: cannot find HDF45 library path." >&5
+- { { echo "$as_me:$LINENO: error: cannot find HDF45 library path." >&5
-echo "$as_me: error: cannot find HDF45 library path." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? "cannot find HDF45 library path." "$LINENO" 5
++ as_fn_error $? "cannot find HDF45 library path." "$LINENO" 5
fi
- USEH45="yes"
+ USEH45="yes"
fi
;;
esac
@@ -5629,14 +5731,14 @@ index 9e30023..e6012e6 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USEH45" >&5
+$as_echo "$USEH45" >&6; }
if test -n "$H45LIB"; then
-- echo "$as_me:$LINENO: result: h4toh5 library found at: $HDF45LIB" >&5
+- echo "$as_me:$LINENO: result: h4toh5 library found at: $HDF45LIB" >&5
-echo "${ECHO_T}h4toh5 library found at: $HDF45LIB" >&6
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: h4toh5 library found at: $HDF45LIB" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: h4toh5 library found at: $HDF45LIB" >&5
+$as_echo "h4toh5 library found at: $HDF45LIB" >&6; }
fi
H45LIB=$HDF45LIB
H45INC=$HDF45INC
-@@ -3911,32 +4264,28 @@ ac_cv_lib_HDF45INC=$HDF45INC
+@@ -3912,32 +4267,28 @@ ac_cv_lib_HDF45INC=$HDF45INC
withval="";
jdkclasses=""
@@ -5679,7 +5781,7 @@ index 9e30023..e6012e6 100755
;;
*)
jdk_inc="`echo $withval |cut -f1 -d,`"
-@@ -3946,157 +4295,17 @@ echo "$as_me: error: JDK needed for compilation." >&2;}
+@@ -3947,157 +4298,17 @@ echo "$as_me: error: JDK needed for compilation." >&2;}
CPPFLAGS="$CPPFLAGS $COPT -I$jdk_inc -I$jdk_inc/$TARGETLIB"
fi
@@ -5717,14 +5819,14 @@ index 9e30023..e6012e6 100755
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -5843,42 +5945,58 @@ index 9e30023..e6012e6 100755
fi
done
-@@ -4107,9 +4316,7 @@ done
+@@ -4108,9 +4319,7 @@ done
if test -n "$jdk_lib"; then
JAVALIB="$jdk_lib"
else
-- { { echo "$as_me:$LINENO: error: cannot find jdk library path." >&5
+- { { echo "$as_me:$LINENO: error: cannot find jdk library path." >&5
-echo "$as_me: error: cannot find jdk library path." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? "cannot find jdk library path." "$LINENO" 5
++ as_fn_error $? "cannot find jdk library path." "$LINENO" 5
fi
;;
esac
-@@ -4120,9 +4327,7 @@ if test -f $jdkclasses/classes.jar ; then
- JAVACLASSES=$jdkclasses/classes.jar
- JAVACLASSPATH_FOUND=1
+@@ -4121,9 +4330,7 @@ if test -f $jdkclasses/classes.jar ; then
+ JAVACLASSES=$jdkclasses/classes.jar
+ JAVACLASSPATH_FOUND=1
else
-- { { echo "$as_me:$LINENO: error: cannot find jdk classes in JDK lib path." >&5
+- { { echo "$as_me:$LINENO: error: cannot find jdk classes in JDK lib path." >&5
-echo "$as_me: error: cannot find jdk classes in JDK lib path." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? "cannot find jdk classes in JDK lib path." "$LINENO" 5
++ as_fn_error $? "cannot find jdk classes in JDK lib path." "$LINENO" 5
fi
else
-@@ -4146,9 +4351,7 @@ else
- JAVALIB=$JL/jre/lib
- JAVALIB=""
- else
-- { { echo "$as_me:$LINENO: error: cannot find jdk classes in JDK lib path." >&5
+@@ -4147,9 +4354,7 @@ else
+ JAVALIB=$JL/jre/lib
+ JAVALIB=""
+ else
+- { { echo "$as_me:$LINENO: error: cannot find jdk classes in JDK lib path." >&5
-echo "$as_me: error: cannot find jdk classes in JDK lib path." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error $? "cannot find jdk classes in JDK lib path." "$LINENO" 5
- fi
++ as_fn_error $? "cannot find jdk classes in JDK lib path." "$LINENO" 5
+ fi
fi
fi
-@@ -4158,11 +4361,11 @@ CLASSPATH="$JAVACLASSES"":""$HERE"
+@@ -4159,11 +4364,11 @@ CLASSPATH="$JAVACLASSES"":""$HERE"
withval="";
- javabin=""
+ javax=""
+
+-# Check whether --with-javax or --without-javax was given.
+-if test "${with_javax+set}" = set; then
+- withval="$with_javax"
++# Check whether --with-javax was given.
++if test "${with_javax+set}" = set; then :
++ withval=$with_javax;
++fi
+
+-fi;
+ javax=$withval
+
+ if test -n "$javax" ; then
+@@ -4173,11 +4378,11 @@ fi
+ withval="";
+ javabin=""
-# Check whether --with-javabin or --without-javabin was given.
-if test "${with_javabin+set}" = set; then
@@ -5892,7 +6010,7 @@ index 9e30023..e6012e6 100755
javabin=$withval
if test -n "$javabin" ; then
-@@ -4174,10 +4377,10 @@ fi
+@@ -4189,10 +4394,10 @@ fi
# Extract the first word of "java", so it can be a program name with args.
set dummy java; ac_word=$2
@@ -5907,7 +6025,7 @@ index 9e30023..e6012e6 100755
else
case $JAVA in
[\\/]* | ?:[\\/]*)
-@@ -4189,34 +4392,35 @@ for as_dir in $JAVABIN
+@@ -4204,34 +4409,35 @@ for as_dir in $JAVABIN
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5956,7 +6074,7 @@ index 9e30023..e6012e6 100755
else
case $JAVAC in
[\\/]* | ?:[\\/]*)
-@@ -4228,34 +4432,35 @@ for as_dir in $JAVABIN
+@@ -4243,34 +4449,35 @@ for as_dir in $JAVABIN
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6005,7 +6123,7 @@ index 9e30023..e6012e6 100755
else
case $JAVADOC in
[\\/]* | ?:[\\/]*)
-@@ -4267,34 +4472,35 @@ for as_dir in $JAVABIN
+@@ -4282,34 +4489,35 @@ for as_dir in $JAVABIN
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6054,7 +6172,7 @@ index 9e30023..e6012e6 100755
else
case $JAR in
[\\/]* | ?:[\\/]*)
-@@ -4306,42 +4512,41 @@ for as_dir in $JAVABIN
+@@ -4321,42 +4529,41 @@ for as_dir in $JAVABIN
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6112,7 +6230,7 @@ index 9e30023..e6012e6 100755
;;
no)
;;
-@@ -4355,16 +4560,14 @@ esac
+@@ -4370,16 +4577,14 @@ esac
withval="";
@@ -6134,7 +6252,7 @@ index 9e30023..e6012e6 100755
;;
no)
#AC_MSG_ERROR( jhdf5 needed for compilation.)
-@@ -4392,15 +4595,15 @@ fi
+@@ -4407,15 +4612,15 @@ fi
JH45INST_FOUND=1
if test -z "$JH45INST" ; then
@@ -6155,34 +6273,34 @@ index 9e30023..e6012e6 100755
+$as_echo "$ac_cv_lib_JH45INST" >&6; }
fi
if test $JH45INST_FOUND -eq 1; then
- if test -z "$JH45INST" ; then
-@@ -4409,12 +4612,6 @@ if test $JH45INST_FOUND -eq 1; then
- if test \( ! -d "$JH45INST" \); then
- JH45INST_FOUND=0
- fi
-- if test \( ! -w "$JH45INST" \); then
-- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5
+ if test -z "$JH45INST" ; then
+@@ -4424,12 +4629,6 @@ if test $JH45INST_FOUND -eq 1; then
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5
-echo "$as_me: error: $JAVINST : not writable " >&2;}
- { (exit 1); exit 1; }; }
-- JH45INST_FOUND=0
-- fi
+- JH45INST_FOUND=0
+- fi
fi
until test $JH45INST_FOUND -eq 1; do
- echo "Please type the directory in which to install the JH45"
-@@ -4423,12 +4620,6 @@ until test $JH45INST_FOUND -eq 1; do
- if test \( ! -d "$JH45INST" \); then
- JH45INST_FOUND=0
- fi
-- if test \( ! -w "$JH45INST" \); then
-- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5
+ echo "Please type the directory in which to install the JH45"
+@@ -4438,12 +4637,6 @@ until test $JH45INST_FOUND -eq 1; do
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5
-echo "$as_me: error: $JAVINST : not writable " >&2;}
- { (exit 1); exit 1; }; }
-- JH45INST_FOUND=0
-- fi
+- JH45INST_FOUND=0
+- fi
done
ac_cv_lib_JH45INST=$JH45INST
-@@ -4436,6 +4627,14 @@ JHVINST=$JH45INST
+@@ -4451,6 +4644,14 @@ JHVINST=$JH45INST
JH5INST=$JH45INST
case $target in
@@ -6197,7 +6315,16 @@ index 9e30023..e6012e6 100755
alpha-dec-osf*.*)
LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
LLEXT="a";
-@@ -4600,7 +4799,8 @@ OUTPUT_FILES="$OUTPUT_FILES"
+@@ -4599,7 +4800,7 @@ if test -d "./test"; then
+ ##
+ ## Everything
+ ##
+-#OUTPUT_FILES="$OUTPUT_FILES test/Makefile test/object/misc/testh4file.sh test/object/misc/testh5file.sh test/object/misc/Makefile test/object/misc/runtests.sh test/hdf5lib/junit.sh test/hdf5lib/Makefile test/uitest/junit.sh test/uitest/Makefile examples/Makefile examples/intro/Makefile examples/datasets/Makefile examples/datatypes/Makefile examples/groups/Makefile"
++# OUTPUT_FILES="$OUTPUT_FILES test/Makefile test/object/misc/testh4file.sh test/object/misc/testh5file.sh test/object/misc/Makefile test/object/misc/runtests.sh test/hdf5lib/junit.sh test/hdf5lib/Makefile test/uitest/junit.sh test/uitest/Makefile examples/Makefile examples/intro/Makefile examples/datasets/Makefile examples/datatypes/Makefile examples/groups/Makefile"
+ OUTPUT_FILES="$OUTPUT_FILES test/Makefile test/object/misc/testh4file.sh test/object/misc/testh5file.sh test/object/misc/Makefile test/object/misc/runtests.sh test/hdf5lib/junit.sh test/hdf5lib/Makefile examples/Makefile examples/intro/Makefile examples/datasets/Makefile examples/datatypes/Makefile examples/groups/Makefile"
+ else
+ ##
+@@ -4618,7 +4819,8 @@ OUTPUT_FILES="$OUTPUT_FILES"
fi
fi
@@ -6207,7 +6334,7 @@ index 9e30023..e6012e6 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -4619,39 +4819,70 @@ _ACEOF
+@@ -4637,39 +4839,70 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -6243,14 +6370,16 @@ index 9e30023..e6012e6 100755
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+- "s/'/'\\\\''/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
++ "s/'/'\\\\''/g;
++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
@@ -6297,7 +6426,7 @@ index 9e30023..e6012e6 100755
fi
fi
rm -f confcache
-@@ -4660,63 +4891,55 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -4678,63 +4911,55 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -6306,13 +6435,13 @@ index 9e30023..e6012e6 100755
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ ]*\):*/\1/;
+-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
--s/^[^=]*=[ ]*$//;
+-s/^[^=]*=[ ]*$//;
-}'
-fi
-
@@ -6334,16 +6463,16 @@ index 9e30023..e6012e6 100755
+}
t clear
-: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
+:clear
+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
t quote
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
t quote
-d
-: quote
--s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
+-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
@@ -6382,7 +6511,7 @@ index 9e30023..e6012e6 100755
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
@@ -6395,7 +6524,7 @@ index 9e30023..e6012e6 100755
done
LIBOBJS=$ac_libobjs
-@@ -4724,12 +4947,14 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -4742,12 +4967,14 @@ LTLIBOBJS=$ac_ltlibobjs
@@ -6414,17 +6543,20 @@ index 9e30023..e6012e6 100755
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -4739,81 +4964,253 @@ cat >$CONFIG_STATUS <<_ACEOF
+@@ -4757,81 +4984,253 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
+-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
@@ -6432,9 +6564,7 @@ index 9e30023..e6012e6 100755
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
-
--# Be Bourne compatible
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
@@ -6460,6 +6590,8 @@ index 9e30023..e6012e6 100755
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
+-else
+- as_unset=false
+
+as_nl='
+'
@@ -6477,8 +6609,7 @@ index 9e30023..e6012e6 100755
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
- else
-- as_unset=false
++else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
@@ -6498,8 +6629,8 @@ index 9e30023..e6012e6 100755
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
- fi
-
++fi
++
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
@@ -6507,9 +6638,11 @@ index 9e30023..e6012e6 100755
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
-+fi
-+
-+
+ fi
+
+
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
@@ -6541,9 +6674,7 @@ index 9e30023..e6012e6 100755
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
-
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
++
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
@@ -6636,9 +6767,7 @@ index 9e30023..e6012e6 100755
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
-
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -6656,7 +6785,9 @@ index 9e30023..e6012e6 100755
+ }
+fi # as_fn_arith
+
-+
+
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -6681,14 +6812,15 @@ index 9e30023..e6012e6 100755
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
@@ -6710,7 +6842,7 @@ index 9e30023..e6012e6 100755
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -4821,148 +5218,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+@@ -4839,148 +5238,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -6765,21 +6897,21 @@ index 9e30023..e6012e6 100755
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
- done
-done
-;;
@@ -6819,7 +6951,7 @@ index 9e30023..e6012e6 100755
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
+-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
@@ -6960,7 +7092,7 @@ index 9e30023..e6012e6 100755
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -4971,31 +5343,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -4989,31 +5363,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -6968,19 +7100,20 @@ index 9e30023..e6012e6 100755
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
--IFS=" $as_nl"
+-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
exec 6>&1
+-
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
++
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
@@ -7002,7 +7135,7 @@ index 9e30023..e6012e6 100755
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -5003,125 +5364,118 @@ generated by GNU Autoconf 2.59. Invocation command line was
+@@ -5021,125 +5384,118 @@ generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -7061,7 +7194,7 @@ index 9e30023..e6012e6 100755
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
-- instantiate the configuration file FILE
+- instantiate the configuration file FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
@@ -7112,14 +7245,14 @@ index 9e30023..e6012e6 100755
+ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+ ac_shift=:
-+ ;;
-+ --*=)
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=
ac_shift=:
;;
- -*)
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
ac_option=$1
ac_optarg=$2
@@ -7189,7 +7322,7 @@ index 9e30023..e6012e6 100755
esac
shift
-@@ -5135,30 +5489,44 @@ if $ac_cs_silent; then
+@@ -5153,30 +5509,44 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -7246,7 +7379,7 @@ index 9e30023..e6012e6 100755
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -5168,387 +5536,458 @@ if $ac_need_defaults; then
+@@ -5186,388 +5556,458 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -7281,10 +7414,6 @@ index 9e30023..e6012e6 100755
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
--{
-- echo "$me: cannot create a temporary directory in ." >&2
-- { (exit 1); exit 1; }
--}
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
@@ -7294,7 +7423,7 @@ index 9e30023..e6012e6 100755
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
-
++
+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+ ac_cs_awk_getline=:
+ ac_cs_awk_pipe_init=
@@ -7328,11 +7457,13 @@ index 9e30023..e6012e6 100755
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
- _ACEOF
-
--cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++
+# Create commands to substitute file output variables.
-+{
+ {
+- echo "$me: cannot create a temporary directory in ." >&2
+- { (exit 1); exit 1; }
+-}
+ echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+ echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+ echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
@@ -7343,9 +7474,6 @@ index 9e30023..e6012e6 100755
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+rm -f conf$$files.sh
--#
--# CONFIG_FILES section.
--#
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
@@ -7357,111 +7485,7 @@ index 9e30023..e6012e6 100755
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at AWK@,$AWK,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at CPP@,$CPP,;t t
--s, at EGREP@,$EGREP,;t t
--s, at RM@,$RM,;t t
--s, at FIND@,$FIND,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at target@,$target,;t t
--s, at target_cpu@,$target_cpu,;t t
--s, at target_vendor@,$target_vendor,;t t
--s, at target_os@,$target_os,;t t
--s, at ZLIB@,$ZLIB,;t t
--s, at JPEGLIB@,$JPEGLIB,;t t
--s, at SZLIB@,$SZLIB,;t t
--s, at HDF4LIB@,$HDF4LIB,;t t
--s, at HDF5LIB@,$HDF5LIB,;t t
--s, at LIBH45@,$LIBH45,;t t
--s, at jdkclasses@,$jdkclasses,;t t
--s, at JAVALIB@,$JAVALIB,;t t
--s, at javabin@,$javabin,;t t
--s, at JAVA@,$JAVA,;t t
--s, at JAVAC@,$JAVAC,;t t
--s, at JAVADOC@,$JAVADOC,;t t
--s, at JAR@,$JAR,;t t
--s, at LD@,$LD,;t t
--s, at LDOPT@,$LDOPT,;t t
--s, at LDOPT2@,$LDOPT2,;t t
--s, at LLEXT@,$LLEXT,;t t
--s, at SLEXT@,$SLEXT,;t t
--s, at JSLEXT@,$JSLEXT,;t t
--s, at COPT@,$COPT,;t t
--s, at COPTNOSHARE@,$COPTNOSHARE,;t t
--s, at JAVABIN@,$JAVABIN,;t t
--s, at JAVAINC@,$JAVAINC,;t t
--s, at JAVAINC2@,$JAVAINC2,;t t
--s, at HDF5INC@,$HDF5INC,;t t
--s, at HDF4INC@,$HDF4INC,;t t
--s, at H45LIB@,$H45LIB,;t t
--s, at H45INC@,$H45INC,;t t
--s, at TARGET@,$TARGET,;t t
--s, at JAVATARG@,$JAVATARG,;t t
--s, at CLASSPATH@,$CLASSPATH,;t t
--s, at JH45INST@,$JH45INST,;t t
--s, at JHVINST@,$JHVINST,;t t
--s, at JH5INST@,$JH5INST,;t t
--s, at VERSSTRING@,$VERSSTRING,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--/@VERSION@/r $VERSION
--s, at VERSION@,,;t t
--CEOF
++
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
@@ -7472,7 +7496,7 @@ index 9e30023..e6012e6 100755
+ fi
+done
+rm -f conf$$subs.sh
-
++
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
@@ -7564,43 +7588,7 @@ index 9e30023..e6012e6 100755
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-- fi
+-cat >>$CONFIG_STATUS <<_ACEOF
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
@@ -7623,23 +7611,120 @@ index 9e30023..e6012e6 100755
+s/^[^=]*=[ ]*$//
+}'
+fi
-+
+
+-#
+-# CONFIG_FILES section.
+-#
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- fi # test -n "$CONFIG_FILES"
++fi # test -n "$CONFIG_FILES"
+
+-# No need to generate the scripts if there are no CONFIG_FILES.
+-# This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+- # Protect against being on the right side of a sed subst in config.status.
+- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at AWK@,$AWK,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CPP@,$CPP,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at RM@,$RM,;t t
+-s, at FIND@,$FIND,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at ZLIB@,$ZLIB,;t t
+-s, at JPEGLIB@,$JPEGLIB,;t t
+-s, at SZLIB@,$SZLIB,;t t
+-s, at HDF4LIB@,$HDF4LIB,;t t
+-s, at HDF5LIB@,$HDF5LIB,;t t
+-s, at LIBH45@,$LIBH45,;t t
+-s, at jdkclasses@,$jdkclasses,;t t
+-s, at JAVALIB@,$JAVALIB,;t t
+-s, at javabin@,$javabin,;t t
+-s, at JAVA@,$JAVA,;t t
+-s, at JAVAC@,$JAVAC,;t t
+-s, at JAVADOC@,$JAVADOC,;t t
+-s, at JAR@,$JAR,;t t
+-s, at LD@,$LD,;t t
+-s, at LDOPT@,$LDOPT,;t t
+-s, at LDOPT2@,$LDOPT2,;t t
+-s, at LLEXT@,$LLEXT,;t t
+-s, at SLEXT@,$SLEXT,;t t
+-s, at JSLEXT@,$JSLEXT,;t t
+-s, at COPT@,$COPT,;t t
+-s, at COPTNOSHARE@,$COPTNOSHARE,;t t
+-s, at JAVABIN@,$JAVABIN,;t t
+-s, at JAVAX@,$JAVAX,;t t
+-s, at JAVAINC@,$JAVAINC,;t t
+-s, at JAVAINC2@,$JAVAINC2,;t t
+-s, at HDF5INC@,$HDF5INC,;t t
+-s, at HDF4INC@,$HDF4INC,;t t
+-s, at H45LIB@,$H45LIB,;t t
+-s, at H45INC@,$H45INC,;t t
+-s, at TARGET@,$TARGET,;t t
+-s, at JAVATARG@,$JAVATARG,;t t
+-s, at CLASSPATH@,$CLASSPATH,;t t
+-s, at JH45INST@,$JH45INST,;t t
+-s, at JHVINST@,$JHVINST,;t t
+-s, at JH5INST@,$JH5INST,;t t
+-s, at VERSSTRING@,$VERSSTRING,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-/@VERSION@/r $VERSION
+-s, at VERSION@,,;t t
+-CEOF
-_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+
+eval set X " :F $CONFIG_FILES "
+shift
+for ac_tag
@@ -7660,7 +7745,39 @@ index 9e30023..e6012e6 100755
+ shift
+ ac_file=$1
+ shift
-+
+
+- cat >>$CONFIG_STATUS <<\_ACEOF
+- # Split the substitutions into bite-sized pieces for seds with
+- # small command number limits, like on Digital OSF/1 and HP-UX.
+- ac_max_sed_lines=48
+- ac_sed_frag=1 # Number of current file.
+- ac_beg=1 # First line for current file.
+- ac_end=$ac_max_sed_lines # Line after last line for current file.
+- ac_more_lines=:
+- ac_sed_cmds=
+- while $ac_more_lines; do
+- if test $ac_beg -gt 1; then
+- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- else
+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- fi
+- if test ! -s $tmp/subs.frag; then
+- ac_more_lines=false
+- else
+- # The purpose of the label and of the branching condition is to
+- # speed up the sed processing (if there are no `@' at all, there
+- # is no need to browse any of the substitutions).
+- # These are the two extra sed commands mentioned above.
+- (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+- else
+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+- fi
+- ac_sed_frag=`expr $ac_sed_frag + 1`
+- ac_beg=$ac_end
+- ac_end=`expr $ac_end + $ac_max_sed_lines`
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
@@ -7693,7 +7810,12 @@ index 9e30023..e6012e6 100755
+ configure_input="$ac_file. $configure_input"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
-+ fi
+ fi
+- done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
+- fi
+-fi # test -n "$CONFIG_FILES"
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
@@ -7701,7 +7823,19 @@ index 9e30023..e6012e6 100755
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
-+
+
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+- case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
+ case $ac_tag in
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
@@ -7713,16 +7847,16 @@ index 9e30023..e6012e6 100755
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
+- X"$ac_file" : 'X\(//\)[^/]' \| \
+- X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
@@ -7732,22 +7866,24 @@ index 9e30023..e6012e6 100755
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
++ X"$ac_file" : 'X\(//\)[^/]' \| \
++ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
@@ -7886,7 +8022,7 @@ index 9e30023..e6012e6 100755
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
+- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
@@ -7895,24 +8031,24 @@ index 9e30023..e6012e6 100755
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
-- echo "$f";;
+- echo "$f";;
- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
-- fi;;
+- fi;;
- esac
- done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -7934,7 +8070,9 @@ index 9e30023..e6012e6 100755
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
@@ -7944,9 +8082,7 @@ index 9e30023..e6012e6 100755
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-- sed "$ac_vpsub
++_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
@@ -7997,9 +8133,7 @@ index 9e30023..e6012e6 100755
+ $AWK -f "$ac_tmp/subs.awk" | $SHELL
+fi \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
--done
--_ACEOF
++
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
@@ -8017,10 +8151,12 @@ index 9e30023..e6012e6 100755
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+-done
+-_ACEOF
+
-cat >>$CONFIG_STATUS <<\_ACEOF
-{ (exit 0); exit 0; }
-+
+ esac
+
+done # for ac_tag
@@ -8037,7 +8173,7 @@ index 9e30023..e6012e6 100755
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -5568,7 +6007,11 @@ if test "$no_create" != yes; then
+@@ -5587,7 +6027,11 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -8051,5 +8187,5 @@ index 9e30023..e6012e6 100755
--
-1.7.7
+1.7.7.6
diff --git a/jhdf5.spec b/jhdf5.spec
index 00dec0c..5d65909 100644
--- a/jhdf5.spec
+++ b/jhdf5.spec
@@ -1,6 +1,6 @@
Name: jhdf5
-Version: 2.7
-Release: 8%{?dist}
+Version: 2.8
+Release: 1%{?dist}
Summary: Java HDF5 Object Package
Group: Development/Libraries
@@ -129,6 +129,11 @@ sed -i 's/\r//' docs/hdfview/UsersGuide/RELEASE.txt
# Make JNI (libjhdf.so libjhdf5.so) and
# make only required jars (not netcdf nor fits related packages)
+pushd .
+cd ncsa; \
+make
+popd
+
make natives jhdf-packages jhdf5-packages \
jhdfobj-packages jhdfview-packages
@@ -234,6 +239,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc docs
%changelog
+* Wed Jan 25 2012 Clément David <davidcl at fedoraproject.org> - 2.8-1
+- update to version 2.8
+
* Wed Jan 25 2012 Clément David <davidcl at fedoraproject.org> - 2.7-8
- move jars to more standard locations
diff --git a/sources b/sources
index 4e1d887..a14f922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e924e90477ac88457298beebfca10b1 hdf-java-2.7-src.tar
+4ade28a25622cdbf32e154dd610821d2 hdf-java-2.8-src.tar
More information about the scm-commits
mailing list