[Pkg-lustre-svn-commit] updated: [4a83aa5] Imported new patches for 1.41.10
Patrick Winnertz
winnie at debian.org
Fri Aug 13 10:09:16 UTC 2010
The following commit has been merged in the master branch:
commit 4a83aa5ce17259bed757e963c311388557085530
Author: Patrick Winnertz <winnie at debian.org>
Date: Wed May 12 10:01:29 2010 +0200
Imported new patches for 1.41.10
Signed-off-by: Patrick Winnertz <winnie at debian.org>
diff --git a/debian/patches/CVS/Entries b/debian/patches/CVS/Entries
new file mode 100644
index 0000000..bf31a08
--- /dev/null
+++ b/debian/patches/CVS/Entries
@@ -0,0 +1,74 @@
+/ChangeLog/1.30/Wed Feb 24 07:40:39 2010//THEAD
+/README/1.5/Thu Aug 7 15:30:57 2008//THEAD
+/e2fsprogs-add-io_channel_readahead.patch/1.8/Tue Feb 16 18:52:13 2010/-ko/THEAD
+/e2fsprogs-bad-ininode-ea.patch/1.2/Mon Apr 27 23:31:35 2009/-ko/THEAD
+/e2fsprogs-blkid-zfs.patch/1.6/Tue Feb 23 20:43:02 2010/-ko/THEAD
+/e2fsprogs-config-before-cmdline.patch/1.9/Fri Oct 30 19:50:48 2009/-ko/THEAD
+/e2fsprogs-count_wrong_valid.patch/1.1/Sat Mar 14 11:06:04 2009/-ko/THEAD
+/e2fsprogs-disp-extent_header.patch/1.2/Fri Sep 5 20:55:29 2008/-ko/THEAD
+/e2fsprogs-e2fsck_D.patch/1.1/Wed Feb 24 07:40:39 2010/-ko/THEAD
+/e2fsprogs-e2fsck_exclusive.patch/1.2/Wed Feb 24 04:52:49 2010/-ko/THEAD
+/e2fsprogs-e2scan.patch/1.56/Wed Feb 10 11:23:51 2010/-ko/THEAD
+/e2fsprogs-expand-extra-isize.patch/1.17/Fri Oct 30 20:42:45 2009/-ko/THEAD
+/e2fsprogs-extended_ops.patch/1.2/Fri Sep 5 20:55:30 2008/-ko/THEAD
+/e2fsprogs-extents.patch/1.30/Fri Oct 30 19:50:48 2009/-ko/THEAD
+/e2fsprogs-fid_in_dirent.patch/1.5/Mon Nov 9 09:23:02 2009/-ko/THEAD
+/e2fsprogs-fiemap-lustre.patch/1.3/Fri Oct 30 19:50:48 2009/-ko/THEAD
+/e2fsprogs-i_size-corruption.patch/1.2/Fri Feb 1 22:39:26 2008/-ko/THEAD
+/e2fsprogs-ibadness-counter.patch/1.14/Mon Apr 27 23:31:36 2009/-ko/THEAD
+/e2fsprogs-lazy_journal_init.patch/1.1/Tue Feb 23 20:51:06 2010/-ko/THEAD
+/e2fsprogs-lfsck-absolute-path.patch/1.1/Sun Jul 19 18:52:13 2009/-ko/THEAD
+/e2fsprogs-lfsck.patch/1.50/Tue Feb 23 19:29:27 2010/-ko/THEAD
+/e2fsprogs-lsattr.patch/1.1/Fri Jul 25 21:49:29 2008/-ko/THEAD
+/e2fsprogs-lustre_ismounted.patch/1.4/Fri Feb 5 20:19:57 2010/-ko/THEAD
+/e2fsprogs-misc.patch/1.15/Thu Feb 18 13:11:44 2010/-ko/THEAD
+/e2fsprogs-mmp.patch/1.31/Wed Feb 24 05:08:23 2010/-ko/THEAD
+/e2fsprogs-new-opt-shrdblks.patch/1.13/Mon Apr 27 23:31:36 2009/-ko/THEAD
+/e2fsprogs-skip-extent-tests.patch/1.2/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-specdotin.patch/1.3/Fri Feb 1 22:39:27 2008/-ko/THEAD
+/e2fsprogs-tests-f_bad_ea_value.patch/1.1/Wed Feb 4 10:52:29 2009/-ko/THEAD
+/e2fsprogs-tests-f_ea_checks.patch/1.2/Wed Nov 14 20:26:20 2007/-ko/THEAD
+/e2fsprogs-tests-f_expisize.patch/1.4/Fri Feb 1 22:39:27 2008/-ko/THEAD
+/e2fsprogs-tests-f_expisize_ea_del.patch/1.3/Fri Sep 5 20:55:32 2008/-ko/THEAD
+/e2fsprogs-tests-f_extents_bad_blk.patch/1.4/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_ee_block.patch/1.4/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_ee_len.patch/1.4/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_ee_start.patch/1.4/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_eh_depth.patch/1.9/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_eh_entries.patch/1.3/Fri Sep 5 20:55:32 2008/-ko/THEAD
+/e2fsprogs-tests-f_extents_eh_magic.patch/1.3/Fri Sep 5 20:55:32 2008/-ko/THEAD
+/e2fsprogs-tests-f_extents_eh_max.patch/1.3/Fri Sep 5 20:55:32 2008/-ko/THEAD
+/e2fsprogs-tests-f_extents_ei_block.patch/1.3/Fri Sep 5 20:55:32 2008/-ko/THEAD
+/e2fsprogs-tests-f_extents_ei_leaf.patch/1.4/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_imbalanced_tree.patch/1.4/Sun Apr 12 08:11:27 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_inrlevel-incons.patch/1.4/Sun Apr 12 08:11:28 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_orphan_blks.patch/1.4/Sun Apr 12 08:11:28 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_overlap.patch/1.4/Sun Apr 12 08:11:28 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_res_blk.patch/1.4/Sun Apr 12 08:11:28 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_shrd_blk.patch/1.7/Sun Apr 12 08:11:28 2009/-ko/THEAD
+/e2fsprogs-tests-f_extents_split.patch/1.3/Sun Apr 12 08:11:28 2009/-kb/THEAD
+/e2fsprogs-tests-f_extents_unsorted.patch/1.4/Sun Apr 12 08:11:28 2009/-ko/THEAD
+/e2fsprogs-tests-f_fid_in_dirent.patch/1.3/Mon Dec 28 10:19:32 2009/-kb/THEAD
+/e2fsprogs-tests-f_ibadness.patch/1.5/Tue Sep 9 16:59:51 2008/-kb/THEAD
+/e2fsprogs-tests-f_ibadness_bad_extents.patch/1.5/Tue Sep 9 16:59:52 2008/-kb/THEAD
+/e2fsprogs-tests-f_jchksum_bblk.patch/1.4/Fri Jun 12 21:32:54 2009/-kb/THEAD
+/e2fsprogs-tests-f_jchksum_blast_trans.patch/1.4/Fri Jun 12 21:32:54 2009/-kb/THEAD
+/e2fsprogs-tests-f_jchksum_remount.patch/1.3/Fri Sep 5 20:55:34 2008/-kb/THEAD
+/e2fsprogs-tests-f_many_subdirs.patch/1.4/Fri Sep 5 20:55:34 2008/-ko/THEAD
+/e2fsprogs-tests-f_mmp.patch/1.2/Fri Dec 25 05:58:50 2009/-ko/THEAD
+/e2fsprogs-tests-f_pgsize_gt_blksize.patch/1.1/Sat Oct 13 10:11:07 2007/-ko/THEAD
+/e2fsprogs-tests-f_random_corruption.patch/1.10/Tue Oct 28 20:56:57 2008/-ko/THEAD
+/e2fsprogs-tests-f_uninit_blk-uninit-set_inode-uninit-not-set.patch/1.6/Fri Sep 5 20:55:35 2008/-ko/THEAD
+/e2fsprogs-tests-f_uninit_blks-used_blk-uninit-not-set.patch/1.5/Fri Sep 5 20:55:37 2008/-ko/THEAD
+/e2fsprogs-tests-f_uninit_checksum_invalid.patch/1.6/Fri Oct 30 19:50:49 2009/-ko/THEAD
+/e2fsprogs-tests-f_uninit_disable.patch/1.2/Fri Sep 5 20:55:38 2008/-ko/THEAD
+/e2fsprogs-tests-f_uninit_enable.patch/1.3/Fri Oct 30 19:50:49 2009/-ko/THEAD
+/e2fsprogs-tests-f_uninit_incorrect_free_inodes_count.patch/1.5/Fri Sep 5 20:55:38 2008/-ko/THEAD
+/e2fsprogs-tests-f_uninit_ino-ref_beyond_bg-itable-unused.patch/1.7/Fri Oct 30 19:50:49 2009/-ko/THEAD
+/e2fsprogs-tests-f_uninit_restart_fsck.patch/1.4/Fri Oct 30 19:50:49 2009/-ko/THEAD
+/e2fsprogs-tests-f_unsorted_EAs.patch/1.2/Fri Feb 1 22:39:29 2008/-ko/THEAD
+/e2fsprogs-tests-s_basic_scan.patch/1.2/Fri Sep 5 20:55:40 2008/-ko/THEAD
+/e2fsprogs-uninit-fixes.patch/1.7/Fri Oct 30 19:50:49 2009/-ko/THEAD
+/e2fsprogs-version.patch/1.38/Wed Feb 24 07:41:41 2010/-ko/THEAD
+/series/1.81/Wed Feb 24 07:40:39 2010//THEAD
+D
diff --git a/debian/patches/CVS/Entries.Log b/debian/patches/CVS/Entries.Log
new file mode 100644
index 0000000..2a83dd9
--- /dev/null
+++ b/debian/patches/CVS/Entries.Log
@@ -0,0 +1,5 @@
+A D/llnl////
+A D/rh////
+A D/sles////
+R D/rh////
+R D/llnl////
diff --git a/debian/patches/CVS/Repository b/debian/patches/CVS/Repository
new file mode 100644
index 0000000..6999224
--- /dev/null
+++ b/debian/patches/CVS/Repository
@@ -0,0 +1 @@
+lustre-e2fsprogs
diff --git a/debian/patches/CVS/Root b/debian/patches/CVS/Root
new file mode 100644
index 0000000..3b4cc9c
--- /dev/null
+++ b/debian/patches/CVS/Root
@@ -0,0 +1 @@
+:ext:buffalo-pull at cvs.lustre.org:/cvsroot/cfs
diff --git a/debian/patches/CVS/Tag b/debian/patches/CVS/Tag
new file mode 100644
index 0000000..3903919
--- /dev/null
+++ b/debian/patches/CVS/Tag
@@ -0,0 +1 @@
+NHEAD
diff --git a/debian/patches/ChangeLog b/debian/patches/ChangeLog
index a9b5ca6..d947c38 100644
--- a/debian/patches/ChangeLog
+++ b/debian/patches/ChangeLog
@@ -1,3 +1,37 @@
+2010-02-24 Sun Microsystems, Inc.
+ * version 1.41.10-sun2
+
+Severity : major
+Frequency : never
+Bugzilla : 18779
+Description: Fix a corruption problem in upstream e2fsprogs-1.41.10 when
+ "e2fsck -D" is run on a non-indexed directory with a directory
+ entry that sorts before "." or "..". This was never in any
+ Sun-released e2fsck package, but is recorded here to clarify
+ that this bug was fixed in this release.
+
+Severity : normal
+Frequency : only with a corrupt MMP block
+Bugzilla : 21543
+Description: Add check for e2fsck to correct a corrupted MMP block before the
+ filesystem is opened. Fix segfault at close if MMP wasn't started.
+
+Severity : enhancement
+Bugzilla : 21564
+Description: Print message if MMP timeout is very large.
+
+Severity : normal
+Frequency : SLES11 only
+Bugzilla : 20830
+Description: Allow ext2fs_attr_set() to include attribute prefix in the name,
+ instead of using ext2_attr_index_prefix[] outside of libext2fs.
+
+Severity : enhancement
+Bugzilla : 14548
+Description: Improve ZFS device probing in libblkid.
+
+---------------------------------------------------------------------------
+
2009-06-13 Sun Microsystems, Inc.
* version 1.41.6-sun1
@@ -17,6 +51,7 @@ Frequency : always
Bugzilla : 19536
Description: Free block statistics correctly when MMP is turned off
+---------------------------------------------------------------------------
2009-05-12 Sun Microsystems, Inc.
* version 1.41.5-sun2
diff --git a/debian/patches/e2fsprogs-add-io_channel_readahead.patch b/debian/patches/e2fsprogs-add-io_channel_readahead.patch
index 5f14f5e..27b0e0b 100644
--- a/debian/patches/e2fsprogs-add-io_channel_readahead.patch
+++ b/debian/patches/e2fsprogs-add-io_channel_readahead.patch
@@ -23,16 +23,37 @@ Index: e2fsprogs-1.41.1/lib/ext2fs/unix_io.c
===================================================================
--- e2fsprogs-1.41.1.orig/lib/ext2fs/unix_io.c
+++ e2fsprogs-1.41.1/lib/ext2fs/unix_io.c
-@@ -15,6 +15,8 @@
+@@ -15,6 +15,9 @@
* %End-Header%
*/
+#define _XOPEN_SOURCE 600
++#define _DARWIN_C_SOURCE
+#define _FILE_OFFSET_BITS 64
#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
-@@ -78,6 +80,8 @@ static errcode_t unix_close(io_channel c
+@@ -31,6 +34,9 @@
+ #ifdef __linux__
+ #include <sys/utsname.h>
+ #endif
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
+@@ -40,9 +46,6 @@
+ #if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+-#if HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+ #if HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>
+ #endif
+@@ -88,6 +91,8 @@ static errcode_t unix_close(io_channel c
static errcode_t unix_set_blksize(io_channel channel, int blksize);
static errcode_t unix_read_blk(io_channel channel, unsigned long block,
int count, void *data);
@@ -41,7 +62,7 @@ Index: e2fsprogs-1.41.1/lib/ext2fs/unix_io.c
static errcode_t unix_write_blk(io_channel channel, unsigned long block,
int count, const void *data);
static errcode_t unix_flush(io_channel channel);
-@@ -120,6 +124,7 @@ static struct struct_io_manager struct_u
+@@ -130,6 +135,7 @@ static struct struct_io_manager struct_u
unix_get_stats,
unix_read_blk64,
unix_write_blk64,
@@ -49,19 +70,21 @@ Index: e2fsprogs-1.41.1/lib/ext2fs/unix_io.c
};
io_manager unix_io_manager = &struct_unix_manager;
-@@ -674,6 +679,18 @@ static errcode_t unix_write_blk64(io_cha
+@@ -699,6 +705,20 @@ static errcode_t unix_write_blk64(io_cha
#endif /* NO_IO_CACHE */
}
+static errcode_t unix_readahead(io_channel channel, unsigned long block,
+ int count)
+{
++#ifdef POSIX_FADV_WILLNEED
+ struct unix_private_data *data;
+
+ data = (struct unix_private_data *)channel->private_data;
+ posix_fadvise(data->dev, (ext2_loff_t)block * channel->block_size,
+ (ext2_loff_t)count * channel->block_size,
+ POSIX_FADV_WILLNEED);
++#endif
+ return 0;
+}
+
diff --git a/debian/patches/e2fsprogs-blkid-zfs.patch b/debian/patches/e2fsprogs-blkid-zfs.patch
index 87a4c26..4f48f00 100644
--- a/debian/patches/e2fsprogs-blkid-zfs.patch
+++ b/debian/patches/e2fsprogs-blkid-zfs.patch
@@ -1,3 +1,13 @@
+Fix the ZFS device detection by looking at multiple uberblocks to see if
+any are present, rather than looking for the ZFS boot block which is not
+always present.
+
+There may be up to 128 uberblocks, but the first 4 are not written to disk
+on a newly-formatted filesystem so check several of them at different
+offsets within the uberblock array.
+
+Signed-off-by: Andreas Dilger <adilger at sun.com>
+
Index: e2fsprogs-1.41.4/lib/blkid/probe.h
===================================================================
--- e2fsprogs-1.41.4.orig/lib/blkid/probe.h
@@ -23,7 +33,7 @@ Index: e2fsprogs-1.41.4/lib/blkid/probe.c
===================================================================
--- e2fsprogs-1.41.4.orig/lib/blkid/probe.c
+++ e2fsprogs-1.41.4/lib/blkid/probe.c
-@@ -1359,10 +1359,18 @@ static struct blkid_magic type_array[] =
+@@ -1359,10 +1359,19 @@ static struct blkid_magic type_array[] =
{ "iso9660", 32, 1, 5, "CD001", probe_iso9660 },
{ "iso9660", 32, 9, 5, "CDROM", probe_iso9660 },
{ "jfs", 32, 0, 4, "JFS1", probe_jfs },
@@ -31,18 +41,19 @@ Index: e2fsprogs-1.41.4/lib/blkid/probe.c
- { "zfs", 8, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
- { "zfs", 264, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
- { "zfs", 264, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
-+ { "zfs", 128, 0, 8, "\0\0\0\0\0\xba\xb1\xc",probe_zfs },
-+ { "zfs", 128, 0, 8, "\xc\xb1\xba\0\0\0\0\0",probe_zfs },
-+ { "zfs", 132, 0, 8, "\0\0\0\0\0\xba\xb1\xc",probe_zfs },
-+ { "zfs", 132, 0, 8, "\xc\xb1\xba\0\0\0\0\0",probe_zfs },
-+ { "zfs", 136, 0, 8, "\0\0\0\0\0\xba\xb1\xc",probe_zfs },
-+ { "zfs", 136, 0, 8, "\xc\xb1\xba\0\0\0\0\0",probe_zfs },
-+ { "zfs", 384, 0, 8, "\0\0\0\0\0\xba\xb1\xc",probe_zfs },
-+ { "zfs", 384, 0, 8, "\xc\xb1\xba\0\0\0\0\0",probe_zfs },
-+ { "zfs", 388, 0, 8, "\0\0\0\0\0\xba\xb1\xc",probe_zfs },
-+ { "zfs", 388, 0, 8, "\xc\xb1\xba\0\0\0\0\0",probe_zfs },
-+ { "zfs", 392, 0, 8, "\0\0\0\0\0\xba\xb1\xc",probe_zfs },
-+ { "zfs", 392, 0, 8, "\xc\xb1\xba\0\0\0\0\0",probe_zfs },
++ /* ZFS has 128 root blocks (#4 is the first used), check only 6 of them */
++ { "zfs", 128, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
++ { "zfs", 128, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
++ { "zfs", 132, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
++ { "zfs", 132, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
++ { "zfs", 136, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
++ { "zfs", 136, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
++ { "zfs", 384, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
++ { "zfs", 384, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
++ { "zfs", 388, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
++ { "zfs", 388, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
++ { "zfs", 392, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
++ { "zfs", 392, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
{ "hfsplus", 1, 0, 2, "BD", probe_hfsplus },
{ "hfsplus", 1, 0, 2, "H+", probe_hfsplus },
{ "hfsplus", 1, 0, 2, "HX", probe_hfsplus },
diff --git a/debian/patches/e2fsprogs-config-before-cmdline.patch b/debian/patches/e2fsprogs-config-before-cmdline.patch
index 108ac10..b6b4abc 100644
--- a/debian/patches/e2fsprogs-config-before-cmdline.patch
+++ b/debian/patches/e2fsprogs-config-before-cmdline.patch
@@ -6,11 +6,11 @@ parsing is not cumulative.
Signed-off-by: Jim Garlick <garlick at llnl.gov>
Signed-off-by: Andreas Dilger <adilger at clusterfs.com>
-Index: e2fsprogs-1.40.11/e2fsck/unix.c
+Index: e2fsprogs-1.41.9/e2fsck/unix.c
===================================================================
---- e2fsprogs-1.40.11.orig/e2fsck/unix.c
-+++ e2fsprogs-1.40.11/e2fsck/unix.c
-@@ -589,7 +589,6 @@ static errcode_t PRS(int argc, char *arg
+--- e2fsprogs-1.41.9.orig/e2fsck/unix.c
++++ e2fsprogs-1.41.9/e2fsck/unix.c
+@@ -627,7 +627,6 @@ static errcode_t PRS(int argc, char *arg
#ifdef HAVE_SIGNAL_H
struct sigaction sa;
#endif
@@ -18,7 +18,7 @@ Index: e2fsprogs-1.40.11/e2fsck/unix.c
char *cp;
int res; /* result of sscanf */
#ifdef CONFIG_JBD_DEBUG
-@@ -620,6 +619,12 @@ static errcode_t PRS(int argc, char *arg
+@@ -658,6 +657,12 @@ static errcode_t PRS(int argc, char *arg
ctx->program_name = *argv;
else
ctx->program_name = "e2fsck";
@@ -31,7 +31,7 @@ Index: e2fsprogs-1.40.11/e2fsck/unix.c
while ((c = getopt (argc, argv, "panyrcC:B:dE:fvtFVM:b:I:j:P:l:L:N:SsDk")) != EOF)
switch (c) {
case 'C':
-@@ -650,7 +655,7 @@ static errcode_t PRS(int argc, char *arg
+@@ -688,7 +693,7 @@ static errcode_t PRS(int argc, char *arg
ctx->options |= E2F_OPT_COMPRESS_DIRS;
break;
case 'E':
@@ -40,10 +40,10 @@ Index: e2fsprogs-1.40.11/e2fsck/unix.c
break;
case 'p':
case 'a':
-@@ -777,13 +782,6 @@ static errcode_t PRS(int argc, char *arg
+@@ -801,13 +806,6 @@ static errcode_t PRS(int argc, char *arg
+ argv[optind]);
fatal_error(ctx, 0);
}
- ctx->filesystem_name = string_copy(ctx, ctx->filesystem_name, 0);
- if (extended_opts)
- parse_extended_opts(ctx, extended_opts);
-
diff --git a/debian/patches/e2fsprogs-e2freefrag.patch b/debian/patches/e2fsprogs-e2freefrag.patch
deleted file mode 100644
index 2838611..0000000
--- a/debian/patches/e2fsprogs-e2freefrag.patch
+++ /dev/null
@@ -1,504 +0,0 @@
-Index: e2fsprogs-1.41.4/misc/e2freefrag.8.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.4/misc/e2freefrag.8.in 2009-04-21 13:24:09.000000000 -0600
-@@ -0,0 +1,100 @@
-+.\" -*- nroff -*-
-+.TH E2FREEFRAG 8
-+.SH NAME
-+e2freefrag \- report free space fragmentation
-+.SH SYNOPSIS
-+.B e2freefrag
-+[
-+.B \-c chunk_kb
-+]
-+[
-+.B \-h
-+]
-+.B filesys
-+
-+.SH DESCRIPTION
-+.B e2freefrag
-+is used to report free space fragmentation on ext2/3/4 file systems.
-+.I filesys
-+can be a device name (e.g.
-+.IR /dev/hdc1 ", " /dev/sdb2 ).
-+The
-+.B e2freefrag
-+program will scan the block bitmap information to check how many free blocks
-+are present as contiguous free space. The percentage of contiguous free blocks
-+of size and of alignment
-+.IR chunk_kb
-+is reported. It also displays the minimum/maximum/average free chunk size in
-+the filesystem. It also displays an histogram of all free chunks. This
-+information can be used to gauge the level of free space fragmentation in the
-+filesystem.
-+.SH OPTIONS
-+.TP
-+.BI \-c " chunk_kb"
-+Desired size of chunk. It is specified in units of kilobytes (KB). If no
-+.I chunk_kb
-+is specified on the command line, then the default value is 1024KB.
-+.TP
-+.BI \-h
-+Print the usage of the program.
-+.SH EXAMPLE
-+# e2freefrag -c 1024 /dev/sda5
-+.br
-+Device: /dev/sda5
-+.br
-+Blocksize: 4096 bytes
-+.br
-+Total blocks: 5120710
-+.br
-+Free blocks: 831744 (16.2%)
-+.br
-+Chunk size: 1048576 bytes (256 blocks)
-+.br
-+Total chunks: 20003
-+.br
-+Free chunks: 2174 (10.9%)
-+.br
-+
-+Min free chunk: 4 KB
-+.br
-+Max free chunk: 24576 KB
-+.br
-+Avg. free chunk: 340 KB
-+.br
-+
-+HISTOGRAM OF FREE CHUNK SIZES:
-+.br
-+ Range Free chunks
-+.br
-+ 4K... 8K- : 2824
-+.br
-+ 8K... 16K- : 1760
-+.br
-+ 16K... 32K- : 1857
-+.br
-+ 32K... 64K- : 1003
-+.br
-+ 64K... 128K- : 616
-+.br
-+ 128K... 256K- : 479
-+.br
-+ 256K... 512K- : 302
-+.br
-+ 512K... 1024K- : 238
-+.br
-+ 1M... 2M- : 213
-+.br
-+ 2M... 4M- : 173
-+.br
-+ 4M... 8M- : 287
-+.br
-+ 8M... 16M- : 4
-+.br
-+ 16M... 32M- : 1
-+.SH AUTHOR
-+This version of e2freefrag was written by Rupesh Thakare, and modified by
-+Andreas Dilger <adilger at sun.com>, and Kalpak Shah <kalpak.shah at sun.com>.
-+.SH SEE ALSO
-+.IR debugfs (8),
-+.IR dumpe2fs (8),
-+.IR e2fsck (8)
-Index: e2fsprogs-1.41.4/misc/e2freefrag.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.4/misc/e2freefrag.c 2009-04-21 13:18:30.000000000 -0600
-@@ -0,0 +1,275 @@
-+/*
-+ * e2freefrag - report filesystem free-space fragmentation
-+ *
-+ * Copyright (C) 2007 Cluster File Systems, Inc.
-+ *
-+ * Author2: Rupesh Thakare <rupesh at clusterfs.com>
-+ * Andreas Dilger <adilger at clusterfs.com>
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License version 2.
-+ * %End-Header%
-+ */
-+#include <stdio.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
-+#ifdef HAVE_GETOPT_H
-+#include <getopt.h>
-+#else
-+extern char *optarg;
-+extern int optind;
-+#endif
-+
-+#include "ext2fs/ext2_fs.h"
-+#include "ext2fs/ext2fs.h"
-+#include "e2freefrag.h"
-+
-+void usage(const char *prog)
-+{
-+ fprintf(stderr, "usage: %s [-c chunksize in kb] [-h] "
-+ "device_name\n", prog);
-+ exit(1);
-+}
-+
-+static int ul_log2(unsigned long arg)
-+{
-+ int l = 0;
-+
-+ arg >>= 1;
-+ while (arg) {
-+ l++;
-+ arg >>= 1;
-+ }
-+ return l;
-+}
-+
-+void init_chunk_info(ext2_filsys fs, struct chunk_info *info)
-+{
-+ int i;
-+
-+ info->chunkbits = ul_log2(info->chunkbytes);
-+ info->blocksize_bits = ul_log2((unsigned long)fs->blocksize);
-+ info->blks_in_chunk = info->chunkbytes >> info->blocksize_bits;
-+
-+ info->min = ~0UL;
-+ info->max = info->avg = 0;
-+ info->real_free_chunks = 0;
-+
-+ for (i = 0; i < MAX_HIST; i++)
-+ info->histogram.fc_buckets[i] = 0;
-+}
-+
-+void scan_block_bitmap(ext2_filsys fs, struct chunk_info *info)
-+{
-+ unsigned long long blocks_count = fs->super->s_blocks_count;
-+ unsigned long long chunks = (blocks_count + info->blks_in_chunk) >>
-+ (info->chunkbits - info->blocksize_bits);
-+ unsigned long long chunk_num;
-+ unsigned long last_chunk_size = 0;
-+ unsigned long long chunk_start_blk = 0;
-+
-+ for (chunk_num = 0; chunk_num < chunks; chunk_num++) {
-+ unsigned long long blk, num_blks;
-+ int chunk_free;
-+
-+ /* Last chunk may be smaller */
-+ if (chunk_start_blk + info->blks_in_chunk > blocks_count)
-+ num_blks = blocks_count - chunk_start_blk;
-+ else
-+ num_blks = info->blks_in_chunk;
-+
-+ chunk_free = 0;
-+
-+ /* Initialize starting block for first chunk correctly else
-+ * there is a segfault when blocksize = 1024 in which case
-+ * block_map->start = 1 */
-+ for (blk = (chunk_num == 0 ? fs->super->s_first_data_block : 0);
-+ blk < num_blks; blk++, chunk_start_blk++) {
-+ int used = ext2fs_fast_test_block_bitmap(fs->block_map,
-+ chunk_start_blk);
-+ if (!used) {
-+ last_chunk_size++;
-+ chunk_free++;
-+ }
-+
-+ if (used && last_chunk_size != 0) {
-+ unsigned long index;
-+
-+ index = ul_log2(last_chunk_size) + 1;
-+ info->histogram.fc_buckets[index]++;
-+
-+ if (last_chunk_size > info->max)
-+ info->max = last_chunk_size;
-+ if (last_chunk_size < info->min)
-+ info->min = last_chunk_size;
-+ info->avg += last_chunk_size;
-+
-+ info->real_free_chunks++;
-+ last_chunk_size = 0;
-+ }
-+ }
-+
-+ if (chunk_free == info->blks_in_chunk)
-+ info->free_chunks++;
-+ }
-+}
-+
-+errcode_t get_chunk_info(ext2_filsys fs, struct chunk_info *info)
-+{
-+ unsigned long total_chunks;
-+ char *unitp = "KMGTPEZY";
-+ int units = 10;
-+ unsigned long start = 0, end, cum;
-+ int i, retval = 0;
-+
-+ scan_block_bitmap(fs, info);
-+
-+ printf("Total blocks: %lu\nFree blocks: %lu (%0.1f%%)\n",
-+ fs->super->s_blocks_count, fs->super->s_free_blocks_count,
-+ (double)fs->super->s_free_blocks_count * 100 /
-+ fs->super->s_blocks_count);
-+
-+ printf("\nChunksize: %u bytes (%u blocks)\n",
-+ info->chunkbytes, info->blks_in_chunk);
-+ total_chunks = (fs->super->s_blocks_count + info->blks_in_chunk) >>
-+ (info->chunkbits - info->blocksize_bits);
-+ printf("Total chunks: %lu\nFree chunks: %lu (%0.1f%%)\n",
-+ total_chunks, info->free_chunks,
-+ (double)info->free_chunks * 100 / total_chunks);
-+
-+ /* Display chunk information in KB */
-+ if (info->real_free_chunks) {
-+ info->min = (info->min * fs->blocksize) >> 10;
-+ info->max = (info->max * fs->blocksize) >> 10;
-+ info->avg = (info->avg / info->real_free_chunks *
-+ fs->blocksize) >> 10;
-+ } else {
-+ info->min = 0;
-+ }
-+
-+ printf("\nMin free chunk: %lu KB \nMax free chunk: %lu KB\n"
-+ "Avg. free chunk: %lu KB\n", info->min, info->max, info->avg);
-+
-+ printf("\nHISTOGRAM OF FREE CHUNK SIZES:\n");
-+ printf("%15s\t\t%10s\n", "Range", "Free chunks");
-+ for (i = 0; i < MAX_HIST; i++) {
-+ end = 1 << (i + info->blocksize_bits - units);
-+ if (info->histogram.fc_buckets[i] != 0)
-+ printf("%5lu%c...%5lu%c- : %10lu\n", start, *unitp,
-+ end, *unitp, info->histogram.fc_buckets[i]);
-+ start = end;
-+ if (start == 1<<10) {
-+ start = 1;
-+ units += 10;
-+ unitp++;
-+ }
-+ }
-+
-+ return retval;
-+}
-+
-+void close_device(char *device_name, ext2_filsys fs)
-+{
-+ int retval = ext2fs_close(fs);
-+
-+ if (retval)
-+ com_err(device_name, retval, "while closing the filesystem.\n");
-+}
-+
-+void collect_info(ext2_filsys fs, struct chunk_info *chunk_info)
-+{
-+ unsigned int retval = 0, i, free_blks;
-+
-+ printf("Device: %s\n", fs->device_name);
-+ printf("Blocksize: %u bytes\n", fs->blocksize);
-+
-+ retval = ext2fs_read_block_bitmap(fs);
-+ if (retval) {
-+ com_err(fs->device_name, retval, "while reading block bitmap");
-+ close_device(fs->device_name, fs);
-+ exit(1);
-+ }
-+
-+ init_chunk_info(fs, chunk_info);
-+
-+ retval = get_chunk_info(fs, chunk_info);
-+ if (retval) {
-+ com_err(fs->device_name, retval, "while collecting chunk info");
-+ close_device(fs->device_name, fs);
-+ exit(1);
-+ }
-+}
-+
-+void open_device(char *device_name, ext2_filsys *fs)
-+{
-+ int retval;
-+ int flag = EXT2_FLAG_FORCE;
-+
-+ retval = ext2fs_open(device_name, flag, 0, 0, unix_io_manager, fs);
-+ if (retval) {
-+ com_err(device_name, retval, "while opening filesystem");
-+ exit(1);
-+ }
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+ struct chunk_info chunk_info = { .chunkbytes = DEFAULT_CHUNKSIZE };
-+ errcode_t retval = 0;
-+ ext2_filsys fs = NULL;
-+ char *device_name;
-+ char *progname;
-+ char c, *end;
-+
-+ progname = argv[0];
-+
-+ while ((c = getopt(argc, argv, "c:h")) != EOF) {
-+ switch (c) {
-+ case 'c':
-+ chunk_info.chunkbytes = strtoull(optarg, &end, 0);
-+ if (*end != '\0') {
-+ fprintf(stderr, "%s: bad chunk size '%s'\n",
-+ progname, optarg);
-+ usage(progname);
-+ }
-+ if (chunk_info.chunkbytes &
-+ (chunk_info.chunkbytes - 1)) {
-+ fprintf(stderr, "%s: chunk size must be a "
-+ "power of 2.");
-+ usage(progname);
-+ }
-+ chunk_info.chunkbytes *= 1024;
-+ break;
-+ default:
-+ fprintf(stderr, "%s: bad option '%c'\n",
-+ progname, c);
-+ case 'h':
-+ usage(progname);
-+ break;
-+ }
-+ }
-+
-+ if (optind == argc) {
-+ fprintf(stderr, "%s: missing device name.\n", progname);
-+ usage(progname);
-+ }
-+
-+ device_name = argv[optind];
-+
-+ open_device(device_name, &fs);
-+
-+ if (chunk_info.chunkbytes < fs->blocksize) {
-+ fprintf(stderr, "%s: chunksize must be greater than or equal "
-+ "to filesystem blocksize.\n", progname);
-+ exit(1);
-+ }
-+ collect_info(fs, &chunk_info);
-+ close_device(device_name, fs);
-+
-+ return retval;
-+}
-Index: e2fsprogs-1.41.4/misc/e2freefrag.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.4/misc/e2freefrag.h 2009-04-21 13:19:48.000000000 -0600
-@@ -0,0 +1,19 @@
-+#include <sys/types.h>
-+
-+#define DEFAULT_CHUNKSIZE (1024*1024)
-+
-+#define MAX_HIST 32
-+struct free_chunk_histogram {
-+ unsigned long fc_buckets[MAX_HIST];
-+};
-+
-+struct chunk_info {
-+ unsigned long chunkbytes; /* chunk size in bytes */
-+ int chunkbits; /* chunk size in bits */
-+ unsigned long free_chunks; /* total free chunks of given size */
-+ unsigned long real_free_chunks; /* free chunks of any size */
-+ int blocksize_bits; /* fs blocksize in bits */
-+ int blks_in_chunk; /* number of blocks in a chunk */
-+ unsigned long min, max, avg; /* chunk size stats */
-+ struct free_chunk_histogram histogram; /* histogram of all chunk sizes*/
-+};
-Index: e2fsprogs-1.41.4/e2fsprogs.spec.in
-===================================================================
---- e2fsprogs-1.41.4.orig/e2fsprogs.spec.in 2009-04-14 05:56:43.000000000 -0600
-+++ e2fsprogs-1.41.4/e2fsprogs.spec.in 2009-04-21 13:25:19.000000000 -0600
-@@ -143,6 +143,7 @@
- %{_root_sbindir}/tune2fs
- %{_sbindir}/filefrag
- %{_sbindir}/mklost+found
-+%{_sbindir}/e2freefrag
-
- %{_root_libdir}/libblkid.so.*
- %{_root_libdir}/libcom_err.so.*
-@@ -187,6 +188,7 @@
- %{_mandir}/man8/resize2fs.8*
- %{_mandir}/man8/tune2fs.8*
- %{_mandir}/man8/filefrag.8*
-+%{_mandir}/man8/e2freefrag.8*
-
- %files devel
- %defattr(-,root,root)
-Index: e2fsprogs-1.41.4/misc/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/misc/Makefile.in 2009-04-14 05:56:43.000000000 -0600
-+++ e2fsprogs-1.41.4/misc/Makefile.in 2009-04-14 06:09:57.000000000 -0600
-@@ -19,10 +19,10 @@
-
- SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
- $(E2IMAGE_PROG) @FSCK_PROG@ e2undo
--USPROGS= mklost+found filefrag $(UUIDD_PROG)
-+USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG)
- SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
- e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
-- logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
-+ logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
- FMANPAGES= mke2fs.conf.5
-
- UPROGS= chattr lsattr uuidgen
-@@ -44,6 +44,7 @@
- BLKID_OBJS= blkid.o
- FILEFRAG_OBJS= filefrag.o
- E2UNDO_OBJS= e2undo.o
-+E2FREEFRAG_OBJS= e2freefrag.o
-
- PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o
- PROFILED_MKLPF_OBJS= profiled/mklost+found.o
-@@ -71,7 +72,7 @@
- $(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
- $(srcdir)/filefrag.c $(srcdir)/base_device.c \
- $(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
-- $(srcdir)/e2undo.c
-+ $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c
-
- LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
- DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
-@@ -276,6 +277,10 @@
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
-
-+e2freefrag: $(E2FREEFRAG_OBJS)
-+ @echo "LD $@"
-+ @$(CC) $(ALL_LDFLAGS) -o e2freefrag $(E2FREEFRAG_OBJS) $(LIBS)
-+
- filefrag: $(FILEFRAG_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
-@@ -361,6 +366,10 @@
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1
-
-+e2freefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/e2freefrag.8.in
-+ @echo " SUBST $@"
-+ @$(SUBSTITUTE_UPTIME) $(srcdir)/e2freefrag.8.in e2freefrag.8
-+
- filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
-@@ -522,7 +531,7 @@
- clean:
- $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \
- $(FMANPAGES) \
-- base_device base_device.out mke2fs.static filefrag \
-+ base_device base_device.out mke2fs.static filefrag e2freefrag \
- e2initrd_helper partinfo prof_err.[ch] default_profile.c \
- uuidd e2image tune2fs.static tst_ismounted fsck.profiled \
- blkid.profiled tune2fs.profiled e2image.profiled \
-@@ -603,6 +612,9 @@
- blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/blkid/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h
- logsave.o: $(srcdir)/logsave.c
-+e2freefrag.o: $(srcdir)/e2freefrag.c e2freefrag.h \
-+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
-+ $(top_srcdir)/lib/ext2fs/bitops.h
- filefrag.o: $(srcdir)/filefrag.c
- base_device.o: $(srcdir)/base_device.c $(srcdir)/fsck.h
- ismounted.o: $(srcdir)/ismounted.c $(top_srcdir)/lib/et/com_err.h
diff --git a/debian/patches/e2fsprogs-e2fsck_D.patch b/debian/patches/e2fsprogs-e2fsck_D.patch
new file mode 100644
index 0000000..693d354
--- /dev/null
+++ b/debian/patches/e2fsprogs-e2fsck_D.patch
@@ -0,0 +1,35 @@
+From: Theodore Ts'o <tytso at mit.edu>
+Date: February 22, 2010 22:43:41 MST (CA)
+To: Ext4 Developers List <linux-ext4 at vger.kernel.org>
+Subject: [PATCH] e2fsck: Fix bug which can cause e2fsck -fD to corrupt non-indexed directories
+
+E2fsprogs 1.41.10 introduced a regression (in commit b71e018) where
+e2fsck -fD can corrupt non-indexed directories when are exists one or
+more file names which alphabetically sort before ".". This can happen
+with ext2 filesystems or for small directories (take less than a
+block) which contain filenames that begin with a space or some other
+punctuation mark.
+
+Fix this by making sure we never reorder the '.' or '..' entry in the
+directory, since they must be first.
+
+Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
+
+diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
+index 780742e..ceb8543 100644
+--- a/e2fsck/rehash.c
++++ b/e2fsck/rehash.c
+@@ -763,7 +763,12 @@ retry_nohash:
+
+ /* Sort the list */
+ resort:
+- qsort(fd.harray, fd.num_array, sizeof(struct hash_entry), hash_cmp);
++ if (fd.compress)
++ qsort(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
++ hash_cmp);
++ else
++ qsort(fd.harray, fd.num_array, sizeof(struct hash_entry),
++ hash_cmp);
+
+ /*
+ * Look for duplicates
diff --git a/debian/patches/e2fsprogs-e2fsck_exclusive.patch b/debian/patches/e2fsprogs-e2fsck_exclusive.patch
new file mode 100644
index 0000000..bcc146e
--- /dev/null
+++ b/debian/patches/e2fsprogs-e2fsck_exclusive.patch
@@ -0,0 +1,35 @@
+b=13698
+The checks done by e2fsck for mounted vs. read-only runs is confusing.
+
+On the one hand, if e2fsck is NOT run with the "-n" flag (i.e. it might
+modify the filesystem, there is no guarantee that it will open the
+filesystem with the EXCLUSIVE flag (i.e. O_EXCL) to prevent the block
+device from being used (in most cases = mounted).
+
+On the other hand, if e2fsck is run with "-n" (i.e. read-only),
+and the /etc/fstab or /proc/mounts does not report the same block
+device to match the mountpoint (which happens for Lustre, and can
+also happen if there is an overlay mount) then the e2fsck thinks
+the filesystem is unmounted, but fails because the EXCLUSIVE flag
+is set even though it is running read-only.
+
+Signed-off-by: Andreas Dilger <adilger at sun.com>
+
+Index: e2fsprogs-1.41.6/e2fsck/unix.c
+===================================================================
+--- e2fsprogs-1.41.6.orig/e2fsck/unix.c
++++ e2fsprogs-1.41.6/e2fsck/unix.c
+@@ -1230,9 +1230,10 @@ restart:
+ io_ptr = unix_io_manager;
+ flags = EXT2_FLAG_NOFREE_ON_ERROR;
+ if ((ctx->options & E2F_OPT_READONLY) == 0)
+- flags |= EXT2_FLAG_RW;
+- if ((ctx->mount_flags & EXT2_MF_MOUNTED) == 0)
+- flags |= EXT2_FLAG_EXCLUSIVE;
++ flags |= EXT2_FLAG_RW | EXT2_FLAG_EXCLUSIVE;
++ /* we would abort above in check_mount() unless user asks for this */
++ if ((ctx->mount_flags & EXT2_MF_MOUNTED) != 0)
++ flags &= ~EXT2_FLAG_EXCLUSIVE;
+
+ retval = try_open_fs(ctx, flags, io_ptr, &fs);
+
diff --git a/debian/patches/e2fsprogs-e2scan.patch b/debian/patches/e2fsprogs-e2scan.patch
index b44579b..885e45d 100644
--- a/debian/patches/e2fsprogs-e2scan.patch
+++ b/debian/patches/e2fsprogs-e2scan.patch
@@ -1,8 +1,8 @@
-Index: e2fsprogs-1.41.5/configure.in
+Index: e2fsprogs-1.41.10/configure.in
===================================================================
---- e2fsprogs-1.41.5.orig/configure.in
-+++ e2fsprogs-1.41.5/configure.in
-@@ -483,6 +483,28 @@ DEBUGFS_CMT=
+--- e2fsprogs-1.41.10.orig/configure.in
++++ e2fsprogs-1.41.10/configure.in
+@@ -538,6 +538,28 @@ DEBUGFS_CMT=
)
AC_SUBST(DEBUGFS_CMT)
dnl
@@ -31,7 +31,7 @@ Index: e2fsprogs-1.41.5/configure.in
dnl handle --enable-imager
dnl
AC_ARG_ENABLE([imager],
-@@ -687,6 +709,7 @@ AC_CHECK_HEADERS(net/if.h,,,
+@@ -743,6 +765,7 @@ AC_CHECK_HEADERS(net/if.h,,,
#endif
]])
AC_CHECK_HEADERS(db.h)
@@ -39,7 +39,7 @@ Index: e2fsprogs-1.41.5/configure.in
AC_FUNC_VPRINTF
dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen
dnl is not decleared.
-@@ -822,6 +845,53 @@ AC_CHECK_LIB(db-4.6, db_env_create,
+@@ -880,6 +903,53 @@ AC_CHECK_LIB(db-4.6, db_env_create,
AC_DEFINE(HAVE_DB)])
AC_SUBST(DB_LIB)
dnl
@@ -93,20 +93,20 @@ Index: e2fsprogs-1.41.5/configure.in
dnl See if optreset exists
dnl
AC_MSG_CHECKING(for optreset)
-@@ -1038,7 +1108,7 @@ for i in MCONFIG Makefile e2fsprogs.spec
+@@ -1096,7 +1166,7 @@ for i in MCONFIG Makefile e2fsprogs.spec
lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \
lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \
- debugfs/Makefile tests/Makefile tests/progs/Makefile \
+ debugfs/Makefile e2scan/Makefile tests/Makefile tests/progs/Makefile \
- resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ resize/Makefile doc/Makefile intl/Makefile \
+ intl/libgnuintl.h po/Makefile.in ; do
if test -d `dirname ${srcdir}/$i` ; then
- outlist="$outlist $i"
-Index: e2fsprogs-1.41.5/configure
+Index: e2fsprogs-1.41.10/configure
===================================================================
---- e2fsprogs-1.41.5.orig/configure
-+++ e2fsprogs-1.41.5/configure
-@@ -699,6 +699,8 @@ PROFILED_LIBBLKID
+--- e2fsprogs-1.41.10.orig/configure
++++ e2fsprogs-1.41.10/configure
+@@ -708,6 +708,8 @@ PROFILED_LIBBLKID
DEPPROFILED_LIBBLKID
BLKID_CMT
DEBUGFS_CMT
@@ -115,72 +115,79 @@ Index: e2fsprogs-1.41.5/configure
IMAGER_CMT
RESIZER_CMT
FSCK_PROG
-@@ -1385,6 +1387,7 @@ Optional Features:
- --disable-testio-debug disable the use of the test I/O manager for debugging
+@@ -773,6 +775,7 @@ SIZEOF_LONG
+ SIZEOF_LONG_LONG
+ SOCKET_LIB
+ DB_LIB
++SQLITE3_LIB
+ SEM_INIT_LIB
+ UNI_DIFF_OPTS
+ LINUX_CMT
+@@ -1397,6 +1400,7 @@ Optional Features:
+ --disable-libuuid do not build private uuid library
--disable-libblkid do not build private blkid library
--disable-debugfs disable support of debugfs program
+ --disable-e2scan disable support of e2scan program
--disable-imager disable support of e2image program
--disable-resizer disable support of e2resize program
--enable-fsck build fsck wrapper program
-@@ -1410,6 +1413,7 @@ Optional Packages:
+@@ -1421,6 +1425,7 @@ Optional Packages:
+ --with-included-gettext use the GNU gettext library included here
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir
- --with-lustre=LUSTRE specify the path to Lustre sources for lfsck
+ --with-sqlite3=DIR static sqlite3 location
Some influential environment variables:
CC C compiler command
-@@ -4368,6 +4372,30 @@ DEBUGFS_CMT=
+@@ -5374,6 +5379,28 @@ DEBUGFS_CMT=
fi
-+# Check whether --enable-e2scan or --disable-e2scan was given.
++# Check whether --enable-e2scan was given.
+if test "${enable_e2scan+set}" = set; then
-+ enableval="$enable_e2scan"; if test "$enableval" = "no"
++ enableval=$enable_e2scan; if test "$enableval" = "no"
+then
-+ { echo "$as_me:$LINENO: result: Disabling e2scan support" >&5
-+echo "${ECHO_T}Disabling e2scan support" >&6; }
++ echo "Disabling e2scan support"
+ E2SCAN_CMT="#"
+ E2SCAN_MAN=.\"
+else
+ E2SCAN_CMT=
+ E2SCAN_MAN=
-+ { echo "$as_me:$LINENO: result: Enabling e2scan support" >&5
-+echo "${ECHO_T}Enabling e2scan support" >&6; }
++ echo "Enabling e2scan support"
+fi
+
+else
-+ { echo "$as_me:$LINENO: result: Enabling e2scan support by default" >&5
-+echo "${ECHO_T}Enabling e2scan support by default" >&6; }
++ echo "Enabling e2scan support by default"
+E2SCAN_CMT=
+E2SCAN_MAN=
+
+fi
+
+
++
# Check whether --enable-imager was given.
if test "${enable_imager+set}" = set; then
enableval=$enable_imager; if test "$enableval" = "no"
-@@ -12093,6 +12121,156 @@ fi
+@@ -13396,6 +13423,146 @@ fi
done
+for ac_header in sqlite3.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
@@ -191,41 +198,37 @@ Index: e2fsprogs-1.41.5/configure
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ 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'
-+ { (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'
-+ { (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); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
-+ac_header_compiler=no
++ ac_header_compiler=no
+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
@@ -234,24 +237,22 @@ Index: e2fsprogs-1.41.5/configure
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
@@ -259,9 +260,10 @@ Index: e2fsprogs-1.41.5/configure
+
+ ac_header_preproc=no
+fi
++
+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -285,25 +287,19 @@ Index: e2fsprogs-1.41.5/configure
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -316,26 +312,26 @@ Index: e2fsprogs-1.41.5/configure
+done
+
+
-
- for ac_header in sys/disk.h sys/mount.h
+ for ac_func in vprintf
do
-@@ -15668,6 +15846,126 @@ _ACEOF
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+@@ -16787,6 +16954,137 @@ _ACEOF
fi
+OLD_LIBS=$LIBS
+
-+# Check whether --with-sqlite3 or --without-sqlite3 was given.
++# Check whether --with-sqlite3 was given.
+if test "${with_sqlite3+set}" = set; then
-+ withval="$with_sqlite3"
++ withval=$with_sqlite3;
++fi
+
-+fi;
+if test x"$with_sqlite3" != x; then
+ LIBS="$with_sqlite3/libsqlite3.a"
+ as_ac_File=`echo "ac_cv_file_$LIBS" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $LIBS" >&5
-+echo $ECHO_N "checking for $LIBS... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_File+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $LIBS" >&5
++echo $ECHO_N "checking for $LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
@@ -348,8 +344,9 @@ Index: e2fsprogs-1.41.5/configure
+ eval "$as_ac_File=no"
+fi
+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
++ac_res=`eval echo '${'$as_ac_File'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+
+ LIBS="$LIBS -lpthread"
@@ -360,9 +357,9 @@ Index: e2fsprogs-1.41.5/configure
+ for lib in /lib /usr/lib /usr/local/lib; do
+ LIBS="$lib/libsqlite3.a"
+ as_ac_File=`echo "ac_cv_file_$LIBS" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $LIBS" >&5
-+echo $ECHO_N "checking for $LIBS... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_File+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $LIBS" >&5
++echo $ECHO_N "checking for $LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
@@ -375,8 +372,9 @@ Index: e2fsprogs-1.41.5/configure
+ eval "$as_ac_File=no"
+fi
+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
++ac_res=`eval echo '${'$as_ac_File'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+
+ LIBS="$LIBS -lpthread"
@@ -410,13 +408,22 @@ Index: e2fsprogs-1.41.5/configure
+
+_ACEOF
+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
@@ -435,27 +442,27 @@ Index: e2fsprogs-1.41.5/configure
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
++
++
+if test x"$SQLITE3_LIB" == x; then
+ { echo "$as_me:$LINENO: WARNING: no static sqlite3 - e2scan will not support database" >&5
+echo "$as_me: WARNING: no static sqlite3 - e2scan will not support database" >&2;}
+fi
-+
-+
{ echo "$as_me:$LINENO: checking for optreset" >&5
echo $ECHO_N "checking for optreset... $ECHO_C" >&6; }
if test "${ac_cv_have_optreset+set}" = set; then
-@@ -16203,7 +16501,7 @@ for i in MCONFIG Makefile e2fsprogs.spec
+@@ -17322,7 +17620,7 @@ for i in MCONFIG Makefile e2fsprogs.spec
lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \
lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \
- debugfs/Makefile tests/Makefile tests/progs/Makefile \
+ debugfs/Makefile e2scan/Makefile tests/Makefile tests/progs/Makefile \
- resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ resize/Makefile doc/Makefile intl/Makefile \
+ intl/libgnuintl.h po/Makefile.in ; do
if test -d `dirname ${srcdir}/$i` ; then
- outlist="$outlist $i"
-@@ -17021,6 +17319,8 @@ PROFILED_LIBBLKID!$PROFILED_LIBBLKID$ac_
+@@ -18150,6 +18448,8 @@ PROFILED_LIBBLKID!$PROFILED_LIBBLKID$ac_
DEPPROFILED_LIBBLKID!$DEPPROFILED_LIBBLKID$ac_delim
BLKID_CMT!$BLKID_CMT$ac_delim
DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
@@ -464,27 +471,47 @@ Index: e2fsprogs-1.41.5/configure
IMAGER_CMT!$IMAGER_CMT$ac_delim
RESIZER_CMT!$RESIZER_CMT$ac_delim
FSCK_PROG!$FSCK_PROG$ac_delim
-@@ -17085,6 +17385,7 @@ SIZEOF_LONG_LONG!$SIZEOF_LONG_LONG$ac_de
+@@ -18215,6 +18515,7 @@ SIZEOF_LONG!$SIZEOF_LONG$ac_delim
+ SIZEOF_LONG_LONG!$SIZEOF_LONG_LONG$ac_delim
SOCKET_LIB!$SOCKET_LIB$ac_delim
- DLOPEN_LIB!$DLOPEN_LIB$ac_delim
DB_LIB!$DB_LIB$ac_delim
+SQLITE3_LIB!$SQLITE3_LIB$ac_delim
SEM_INIT_LIB!$SEM_INIT_LIB$ac_delim
UNI_DIFF_OPTS!$UNI_DIFF_OPTS$ac_delim
LINUX_CMT!$LINUX_CMT$ac_delim
-@@ -17106,7 +17407,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -18222,9 +18523,6 @@ CYGWIN_CMT!$CYGWIN_CMT$ac_delim
+ UNIX_CMT!$UNIX_CMT$ac_delim
+ root_prefix!$root_prefix$ac_delim
+ root_bindir!$root_bindir$ac_delim
+-root_sbindir!$root_sbindir$ac_delim
+-root_libdir!$root_libdir$ac_delim
+-root_sysconfdir!$root_sysconfdir$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -18266,6 +18564,9 @@ _ACEOF
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++root_sbindir!$root_sbindir$ac_delim
++root_libdir!$root_libdir$ac_delim
++root_sysconfdir!$root_sysconfdir$ac_delim
+ LDFLAG_STATIC!$LDFLAG_STATIC$ac_delim
+ SS_DIR!$SS_DIR$ac_delim
+ ET_DIR!$ET_DIR$ac_delim
+@@ -18277,7 +18578,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: e2fsprogs-1.41.5/e2fsprogs.spec.in
+Index: e2fsprogs-1.41.10/e2fsprogs.spec.in
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsprogs.spec.in
-+++ e2fsprogs-1.41.5/e2fsprogs.spec.in
+--- e2fsprogs-1.41.10.orig/e2fsprogs.spec.in
++++ e2fsprogs-1.41.10/e2fsprogs.spec.in
@@ -149,6 +149,7 @@ exit 0
%{_sbindir}/mklost+found
%{_sbindir}/e2freefrag
@@ -501,10 +528,10 @@ Index: e2fsprogs-1.41.5/e2fsprogs.spec.in
%{_mandir}/man8/e2undo.8*
%{_mandir}/man8/fsck.8*
%{_mandir}/man8/logsave.8*
-Index: e2fsprogs-1.41.5/e2scan/db.c
+Index: e2fsprogs-1.41.10/e2scan/db.c
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2scan/db.c
++++ e2fsprogs-1.41.10/e2scan/db.c
@@ -0,0 +1,265 @@
+#define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
@@ -771,10 +798,10 @@ Index: e2fsprogs-1.41.5/e2scan/db.c
+}
+
+#endif
-Index: e2fsprogs-1.41.5/e2scan/e2scan.8.in
+Index: e2fsprogs-1.41.10/e2scan/e2scan.8.in
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2scan/e2scan.8.in
++++ e2fsprogs-1.41.10/e2scan/e2scan.8.in
@@ -0,0 +1,116 @@
+.TH e2scan 1 "2006 Sep 26" Lustre "backup utilities"
+.SH NAME
@@ -892,10 +919,10 @@ Index: e2fsprogs-1.41.5/e2scan/e2scan.8.in
+and Andreas Dilger <adilger at sun.com>.
+.SH SEE ALSO
+.BR find (1)
-Index: e2fsprogs-1.41.5/e2scan/e2scan.c
+Index: e2fsprogs-1.41.10/e2scan/e2scan.c
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2scan/e2scan.c
++++ e2fsprogs-1.41.10/e2scan/e2scan.c
@@ -0,0 +1,640 @@
+#define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
@@ -1537,10 +1564,10 @@ Index: e2fsprogs-1.41.5/e2scan/e2scan.c
+
+ return 0;
+}
-Index: e2fsprogs-1.41.5/e2scan/Makefile.in
+Index: e2fsprogs-1.41.10/e2scan/Makefile.in
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2scan/Makefile.in
++++ e2fsprogs-1.41.10/e2scan/Makefile.in
@@ -0,0 +1,104 @@
+#
+# Standard e2fsprogs prologue....
@@ -1646,23 +1673,23 @@ Index: e2fsprogs-1.41.5/e2scan/Makefile.in
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
-Index: e2fsprogs-1.41.5/Makefile.in
+Index: e2fsprogs-1.41.10/Makefile.in
===================================================================
---- e2fsprogs-1.41.5.orig/Makefile.in
-+++ e2fsprogs-1.41.5/Makefile.in
-@@ -12,9 +12,10 @@ INSTALL = @INSTALL@
- @RESIZER_CMT at RESIZE_DIR= resize
+--- e2fsprogs-1.41.10.orig/Makefile.in
++++ e2fsprogs-1.41.10/Makefile.in
+@@ -13,9 +13,10 @@ INSTALL = @INSTALL@
@DEBUGFS_CMT at DEBUGFS_DIR= debugfs
+ @UUID_CMT at UUID_LIB_SUBDIR= lib/uuid
@BLKID_CMT at BLKID_LIB_SUBDIR= lib/blkid
+ at E2SCAN_CMT@E2SCAN_DIR= e2scan
- LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/uuid lib/ext2fs $(BLKID_LIB_SUBDIR) intl
+ LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) intl
-PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po $(E2SCAN_DIR)
SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h
-@@ -58,7 +59,7 @@ distclean-doc:
+@@ -59,7 +60,7 @@ distclean-doc:
install: subs all-libs-recursive install-progs-recursive \
install-shlibs-libs-recursive install-doc-libs
@@ -1671,10 +1698,10 @@ Index: e2fsprogs-1.41.5/Makefile.in
install-strip: subs all-libs-recursive install-strip-progs-recursive \
install-shlibs-strip-libs-recursive install-doc-libs
-Index: e2fsprogs-1.41.5/lib/ext2fs/dblist.c
+Index: e2fsprogs-1.41.10/lib/ext2fs/dblist.c
===================================================================
---- e2fsprogs-1.41.5.orig/lib/ext2fs/dblist.c
-+++ e2fsprogs-1.41.5/lib/ext2fs/dblist.c
+--- e2fsprogs-1.41.10.orig/lib/ext2fs/dblist.c
++++ e2fsprogs-1.41.10/lib/ext2fs/dblist.c
@@ -149,7 +149,6 @@ errcode_t ext2fs_copy_dblist(ext2_dblist
* (moved to closefs.c)
*/
@@ -1683,10 +1710,10 @@ Index: e2fsprogs-1.41.5/lib/ext2fs/dblist.c
/*
* Add a directory block to the directory block list
*/
-Index: e2fsprogs-1.41.5/e2scan/filelist.c
+Index: e2fsprogs-1.41.10/e2scan/filelist.c
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2scan/filelist.c
++++ e2fsprogs-1.41.10/e2scan/filelist.c
@@ -0,0 +1,455 @@
+#define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
@@ -2143,10 +2170,10 @@ Index: e2fsprogs-1.41.5/e2scan/filelist.c
+ ret |= DIRENT_ABORT;
+ return ret;
+}
-Index: e2fsprogs-1.41.5/util/subst.conf.in
+Index: e2fsprogs-1.41.10/util/subst.conf.in
===================================================================
---- e2fsprogs-1.41.5.orig/util/subst.conf.in
-+++ e2fsprogs-1.41.5/util/subst.conf.in
+--- e2fsprogs-1.41.10.orig/util/subst.conf.in
++++ e2fsprogs-1.41.10/util/subst.conf.in
@@ -5,6 +5,8 @@ SS_DIR @SS_DIR@
E2FSPROGS_MONTH @E2FSPROGS_MONTH@
E2FSPROGS_YEAR @E2FSPROGS_YEAR@
diff --git a/debian/patches/e2fsprogs-expand-extra-isize.patch b/debian/patches/e2fsprogs-expand-extra-isize.patch
index 493abd7..6d5fa87 100644
--- a/debian/patches/e2fsprogs-expand-extra-isize.patch
+++ b/debian/patches/e2fsprogs-expand-extra-isize.patch
@@ -9,10 +9,10 @@ version fields are required for all inodes in the filesystem.
Signed-off-by: Andreas Dilger <adilger at clusterfs.com>
Signed-off-by: Kalpak Shah <kalpak at clusterfs.com>
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext_attr.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext_attr.c 2009-02-27 22:56:41.000000000 -0500
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext_attr.c
++++ e2fsprogs-1.41.9/lib/ext2fs/ext_attr.c
@@ -17,6 +17,7 @@
#endif
#include <string.h>
@@ -83,7 +83,7 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
header->h_refcount += adjust;
if (newcount)
*newcount = header->h_refcount;
-@@ -136,3 +168,881 @@ errout:
+@@ -136,3 +168,897 @@ errout:
ext2fs_free_mem(&buf);
return retval;
}
@@ -494,6 +494,26 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
+ EXT2_INODE_SIZE(fs->super));
+}
+
++static struct {
++ char str[28];
++ int len;
++} ext2_attr_index_prefix[] = {
++ [EXT2_ATTR_INDEX_USER] = { EXT2_ATTR_INDEX_USER_PREFIX,
++ sizeof(EXT2_ATTR_INDEX_USER_PREFIX) },
++ [EXT2_ATTR_INDEX_POSIX_ACL_ACCESS] =
++ { EXT2_ATTR_INDEX_POSIX_ACL_ACCESS_PREFIX,
++ sizeof(EXT2_ATTR_INDEX_POSIX_ACL_ACCESS_PREFIX) },
++ [EXT2_ATTR_INDEX_POSIX_ACL_DEFAULT] =
++ { EXT2_ATTR_INDEX_POSIX_ACL_DEFAULT_PREFIX,
++ sizeof(EXT2_ATTR_INDEX_POSIX_ACL_DEFAULT_PREFIX) },
++ [EXT2_ATTR_INDEX_TRUSTED] = { EXT2_ATTR_INDEX_TRUSTED_PREFIX,
++ sizeof(EXT2_ATTR_INDEX_TRUSTED_PREFIX) },
++ [EXT2_ATTR_INDEX_LUSTRE] = { EXT2_ATTR_INDEX_LUSTRE_PREFIX,
++ sizeof(EXT2_ATTR_INDEX_LUSTRE_PREFIX) },
++ [EXT2_ATTR_INDEX_SECURITY] = { EXT2_ATTR_INDEX_SECURITY_PREFIX,
++ sizeof(EXT2_ATTR_INDEX_SECURITY_PREFIX)},
++ { "", 0 }
++};
+
+errcode_t ext2fs_attr_set(ext2_filsys fs, ext2_ino_t ino,
+ struct ext2_inode *inode,
@@ -521,6 +541,11 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
+ if (strlen(name) > 255)
+ return EXT2_ET_EA_NAME_TOO_BIG;
+
++ /* If the prefix is still present, skip it */
++ if (strncmp(name, ext2_attr_index_prefix[name_index].str,
++ ext2_attr_index_prefix[name_index].len) == 0)
++ i.name += ext2_attr_index_prefix[name_index].len;
++
+ if (EXT2_INODE_SIZE(fs->super) > EXT2_GOOD_OLD_INODE_SIZE) {
+ inode_large = (struct ext2_inode_large *)inode;
+
@@ -695,20 +720,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
+ return error;
+}
+
-+char *ext2_attr_index_prefix[] = {
-+ [EXT2_ATTR_INDEX_USER] = EXT2_ATTR_INDEX_USER_PREFIX,
-+ [EXT2_ATTR_INDEX_POSIX_ACL_ACCESS] = EXT2_ATTR_INDEX_POSIX_ACL_ACCESS_PREFIX,
-+ [EXT2_ATTR_INDEX_POSIX_ACL_DEFAULT] = EXT2_ATTR_INDEX_POSIX_ACL_DEFAULT_PREFIX,
-+ [EXT2_ATTR_INDEX_TRUSTED] = EXT2_ATTR_INDEX_TRUSTED_PREFIX,
-+ [EXT2_ATTR_INDEX_LUSTRE] = EXT2_ATTR_INDEX_LUSTRE_PREFIX,
-+ [EXT2_ATTR_INDEX_SECURITY] = EXT2_ATTR_INDEX_SECURITY_PREFIX,
-+ NULL
-+};
-+
+int ext2fs_attr_get_next_attr(struct ext2_ext_attr_entry *entry, int name_index,
+ char *buffer, int buffer_size, int start)
+{
-+ const int prefix_len = strlen(ext2_attr_index_prefix[name_index]);
++ const int prefix_len = ext2_attr_index_prefix[name_index].len;
+ int total_len;
+
+ if (!start && !EXT2_EXT_IS_LAST_ENTRY(entry))
@@ -726,7 +741,8 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
+
+ total_len = prefix_len + entry->e_name_len + 1;
+ if (buffer && total_len <= buffer_size) {
-+ memcpy(buffer, ext2_attr_index_prefix[name_index], prefix_len);
++ memcpy(buffer, ext2_attr_index_prefix[name_index].str,
++ prefix_len);
+ memcpy(buffer + prefix_len, entry->e_name, entry->e_name_len);
+ buffer[prefix_len + entry->e_name_len] = '\0';
+ }
@@ -965,10 +981,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext_attr.c
+
+ return error;
+}
-Index: e2fsprogs-1.41.6/e2fsck/unix.c
+Index: e2fsprogs-1.41.9/e2fsck/unix.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/unix.c 2009-06-10 07:30:47.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/unix.c 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/unix.c
++++ e2fsprogs-1.41.9/e2fsck/unix.c
@@ -658,6 +658,12 @@ static void parse_extended_opts(e2fsck_t
extended_usage++;
continue;
@@ -990,7 +1006,7 @@ Index: e2fsprogs-1.41.6/e2fsck/unix.c
fputc('\n', stderr);
exit(1);
}
-@@ -1357,6 +1364,54 @@ print_unsupp_features:
+@@ -1356,6 +1363,54 @@ print_unsupp_features:
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
fatal_error(ctx, 0);
check_if_skip(ctx);
@@ -1045,10 +1061,10 @@ Index: e2fsprogs-1.41.6/e2fsck/unix.c
check_resize_inode(ctx);
if (bad_blocks_file)
read_bad_blocks_file(ctx, bad_blocks_file, replace_bad_blocks);
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_ext_attr.h
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2_ext_attr.h
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2_ext_attr.h 2009-02-14 08:49:08.000000000 -0500
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2_ext_attr.h 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2_ext_attr.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2_ext_attr.h
@@ -15,6 +15,9 @@
/* Maximum number of references to one attribute block */
#define EXT2_EXT_ATTR_REFCOUNT_MAX 1024
@@ -1098,10 +1114,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_ext_attr.h
#define EXT2_EXT_ATTR_PAD_BITS 2
#define EXT2_EXT_ATTR_PAD ((unsigned) 1<<EXT2_EXT_ATTR_PAD_BITS)
#define EXT2_EXT_ATTR_ROUND (EXT2_EXT_ATTR_PAD-1)
-Index: e2fsprogs-1.41.6/e2fsck/e2fsck.h
+Index: e2fsprogs-1.41.9/e2fsck/e2fsck.h
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/e2fsck.h 2009-06-10 07:30:47.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/e2fsck.h 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/e2fsck.h
++++ e2fsprogs-1.41.9/e2fsck/e2fsck.h
@@ -176,6 +176,7 @@ struct resource_track {
#define E2F_FLAG_RESIZE_INODE 0x0400 /* Request to recreate resize inode */
#define E2F_FLAG_GOT_DEVSIZE 0x0800 /* Device size has been fetched */
@@ -1126,10 +1142,10 @@ Index: e2fsprogs-1.41.6/e2fsck/e2fsck.h
/*
* For the use of callers of the e2fsck functions; not used by
* e2fsck functions themselves.
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_fs.h
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2_fs.h
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2_fs.h 2009-02-27 22:57:34.000000000 -0500
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2_fs.h 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2_fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2_fs.h
@@ -421,6 +421,12 @@ struct ext2_inode_large {
#define i_size_high i_dir_acl
@@ -1151,10 +1167,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_fs.h
EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
/*
-Index: e2fsprogs-1.41.6/e2fsck/pass1.c
+Index: e2fsprogs-1.41.9/e2fsck/pass1.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/pass1.c 2009-06-10 07:30:33.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/pass1.c 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/pass1.c
++++ e2fsprogs-1.41.9/e2fsck/pass1.c
@@ -23,6 +23,7 @@
* - A bitmap of which inodes have bad fields. (inode_bad_map)
* - A bitmap of which inodes are in bad blocks. (inode_bb_map)
@@ -1200,12 +1216,10 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
}
/*
-@@ -500,6 +513,156 @@ extern void e2fsck_setup_tdb_icount(e2fs
+@@ -502,6 +515,151 @@ extern void e2fsck_setup_tdb_icount(e2fs
*ret = 0;
}
-+extern char *ext2_attr_index_prefix[];
-+
+int e2fsck_pass1_delete_attr(e2fsck_t ctx, struct ext2_inode_large *inode,
+ struct problem_context *pctx, int needed_size)
+{
@@ -1244,14 +1258,11 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
+ if (entry_size && name[0] != '\0') {
+ pctx->str = name;
+ if (fix_problem(ctx, PR_1_EISIZE_DELETE_EA, pctx)) {
-+ int i;
-+
+ ea_size = EXT2_EXT_ATTR_LEN(entry->e_name_len) +
+ EXT2_EXT_ATTR_SIZE(entry->e_value_size);
-+ i = strlen(ext2_attr_index_prefix[entry->e_name_index]);
+ error = ext2fs_attr_set(ctx->fs, pctx->ino,
+ (struct ext2_inode *)inode,
-+ index, &name[i], 0,0,0);
++ index, name, 0,0,0);
+ if (!error)
+ freed_bytes += ea_size;
+ }
@@ -1357,7 +1368,7 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
void e2fsck_pass1(e2fsck_t ctx)
{
int i;
-@@ -520,6 +683,8 @@ void e2fsck_pass1(e2fsck_t ctx)
+@@ -522,6 +680,8 @@ void e2fsck_pass1(e2fsck_t ctx)
int imagic_fs, extent_fs;
int busted_fs_time = 0;
int inode_size;
@@ -1366,7 +1377,7 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
init_resource_track(&rtrack, ctx->fs->io);
clear_problem_context(&pctx);
-@@ -1037,6 +1202,22 @@ void e2fsck_pass1(e2fsck_t ctx)
+@@ -1039,6 +1199,22 @@ void e2fsck_pass1(e2fsck_t ctx)
} else
check_blocks(ctx, &pctx, block_buf);
@@ -1389,7 +1400,7 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
return;
-@@ -1336,11 +1517,17 @@ static void adjust_extattr_refcount(e2fs
+@@ -1338,11 +1514,17 @@ static void adjust_extattr_refcount(e2fs
break;
pctx.blk = blk;
pctx.errcode = ext2fs_read_ext_attr(fs, blk, block_buf);
@@ -1408,7 +1419,7 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
pctx.blkcount = header->h_refcount;
should_be = header->h_refcount + adjust_sign * count;
pctx.num = should_be;
-@@ -1446,7 +1633,7 @@ static int check_ext_attr(e2fsck_t ctx,
+@@ -1448,7 +1630,7 @@ static int check_ext_attr(e2fsck_t ctx,
pctx->errcode = ext2fs_read_ext_attr(fs, blk, block_buf);
if (pctx->errcode && fix_problem(ctx, PR_1_READ_EA_BLOCK, pctx))
goto clear_extattr;
@@ -1417,10 +1428,10 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
pctx->blk = inode->i_file_acl;
if (((ctx->ext_attr_ver == 1) &&
(header->h_magic != EXT2_EXT_ATTR_MAGIC_v1)) ||
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2fs.h 2009-05-28 10:16:41.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
@@ -491,6 +491,12 @@ typedef struct ext2_icount *ext2_icount_
#define EXT2_CHECK_MAGIC(struct, code) \
if ((struct)->magic != (code)) return (code)
@@ -1434,7 +1445,7 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
/*
* For ext2 compression support
-@@ -828,6 +834,16 @@ extern errcode_t ext2fs_expand_dir(ext2_
+@@ -834,6 +840,16 @@ extern errcode_t ext2fs_expand_dir(ext2_
/* ext_attr.c */
extern __u32 ext2fs_ext_attr_hash_entry(struct ext2_ext_attr_entry *entry,
void *data);
@@ -1451,13 +1462,13 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
extern errcode_t ext2fs_read_ext_attr(ext2_filsys fs, blk_t block, void *buf);
extern errcode_t ext2fs_write_ext_attr(ext2_filsys fs, blk_t block,
void *buf);
-Index: e2fsprogs-1.41.6/e2fsck/problem.h
+Index: e2fsprogs-1.41.9/e2fsck/problem.h
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/problem.h 2009-06-10 07:30:47.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/problem.h 2009-06-10 08:01:08.000000000 -0400
-@@ -218,6 +218,16 @@ struct problem_context {
- /* The test_fs filesystem flag is set and ext4 is available */
- #define PR_0_CLEAR_TESTFS_FLAG 0x00003B
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.h
++++ e2fsprogs-1.41.9/e2fsck/problem.h
+@@ -229,6 +229,16 @@ struct problem_context {
+ #define PR_0_GDT_CSUM_LATCH 0x00003E
+
+/* Invalid s_min_extra_isize */
+#define PR_0_MIN_EXTRA_ISIZE_INVALID 0x000040
@@ -1472,7 +1483,7 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.h
/*
* Pass 1 errors
*/
-@@ -519,6 +529,25 @@ struct problem_context {
+@@ -530,6 +540,25 @@ struct problem_context {
/* eh_depth for in-inode header is bad */
#define PR_1_EXTENT_EH_DEPTH_BAD 0x010063
@@ -1498,7 +1509,7 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.h
/*
* Pass 1b errors
*/
-@@ -989,6 +1018,9 @@ struct problem_context {
+@@ -1000,6 +1029,9 @@ struct problem_context {
/* Inode in use but group is marked INODE_UNINIT */
#define PR_5_INODE_UNINIT 0x050019
@@ -1508,13 +1519,13 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.h
/*
* Post-Pass 5 errors
*/
-Index: e2fsprogs-1.41.6/e2fsck/problem.c
+Index: e2fsprogs-1.41.9/e2fsck/problem.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/problem.c 2009-06-10 07:30:47.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/problem.c 2009-06-10 08:01:08.000000000 -0400
-@@ -385,6 +385,19 @@ static struct e2fsck_problem problem_tab
- N_("The test_fs flag is set (and ext4 is available). "),
- PROMPT_CLEAR, PR_PREEN_OK },
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.c
++++ e2fsprogs-1.41.9/e2fsck/problem.c
+@@ -402,6 +402,19 @@ static struct e2fsck_problem problem_tab
+ N_("One or more @b @g descriptor checksums are invalid. "),
+ PROMPT_FIX, PR_PREEN_OK },
+ { PR_0_MIN_EXTRA_ISIZE_INVALID,
+ N_("@S has invalid s_min_extra_isize. "),
@@ -1525,14 +1536,14 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.c
+ PROMPT_FIX, PR_PREEN_OK },
+
+ { PR_0_CLEAR_EXTRA_ISIZE,
-+ N_("Disable extra_isize feature since @f has 128 byte inodes. "),
++ N_("Disable extra_isize feature since @f has 128 byte inodes.\n"),
+ PROMPT_NONE, 0 },
+
+
/* Pass 1 errors */
/* Pass 1: Checking inodes, blocks, and sizes */
-@@ -888,6 +901,38 @@ static struct e2fsck_problem problem_tab
+@@ -905,6 +918,38 @@ static struct e2fsck_problem problem_tab
N_("@i %i has extent header with incorrect eh_depth\n"),
PROMPT_FIX, 0 },
@@ -1571,7 +1582,7 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.c
/* Pass 1b errors */
/* Pass 1B: Rescan for duplicate/bad blocks */
-@@ -1635,6 +1680,11 @@ static struct e2fsck_problem problem_tab
+@@ -1652,6 +1697,11 @@ static struct e2fsck_problem problem_tab
N_("@g %g @i(s) in use but @g is marked INODE_UNINIT\n"),
PROMPT_FIX, PR_PREEN_OK },
@@ -1583,10 +1594,10 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.c
/* Post-Pass 5 errors */
/* Recreate journal if E2F_FLAG_JOURNAL_INODE flag is set */
-Index: e2fsprogs-1.41.6/e2fsck/e2fsck.c
+Index: e2fsprogs-1.41.9/e2fsck/e2fsck.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/e2fsck.c 2009-02-27 22:56:41.000000000 -0500
-+++ e2fsprogs-1.41.6/e2fsck/e2fsck.c 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/e2fsck.c
++++ e2fsprogs-1.41.9/e2fsck/e2fsck.c
@@ -155,6 +155,7 @@ errcode_t e2fsck_reset_context(e2fsck_t
ctx->fs_fragmented = 0;
ctx->fs_fragmented_dir = 0;
@@ -1595,10 +1606,10 @@ Index: e2fsprogs-1.41.6/e2fsck/e2fsck.c
for (i=0; i < MAX_EXTENT_DEPTH_COUNT; i++)
ctx->extent_depth_count[i] = 0;
-Index: e2fsprogs-1.41.6/e2fsck/pass5.c
+Index: e2fsprogs-1.41.9/e2fsck/pass5.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/pass5.c 2009-06-10 07:30:27.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/pass5.c 2009-06-10 08:02:11.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/pass5.c
++++ e2fsprogs-1.41.9/e2fsck/pass5.c
@@ -61,6 +61,42 @@ void e2fsck_pass5(e2fsck_t ctx)
ext2fs_free_block_bitmap(ctx->block_found_map);
ctx->block_found_map = 0;
@@ -1642,10 +1653,10 @@ Index: e2fsprogs-1.41.6/e2fsck/pass5.c
print_resource_track(ctx, _("Pass 5"), &rtrack, ctx->fs->io);
}
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_err.et.in
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2_err.et.in
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2_err.et.in 2009-05-29 00:09:50.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2_err.et.in 2009-06-10 08:01:08.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2_err.et.in
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2_err.et.in
@@ -419,4 +419,28 @@ ec EXT2_ET_IO_CHANNEL_NO_SUPPORT_64,
ec EXT2_NO_MTAB_FILE,
"Can't check if filesystem is mounted due to missing mtab file"
@@ -1675,3 +1686,15 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_err.et.in
+ "Extended attribute name already exists"
+
end
+Index: e2fsprogs-1.41.9/tests/f_illitable_flexbg/expect.1
+===================================================================
+--- e2fsprogs-1.41.9.orig/tests/f_illitable_flexbg/expect.1
++++ e2fsprogs-1.41.9/tests/f_illitable_flexbg/expect.1
+@@ -9,6 +9,7 @@ Relocate? yes
+ Group descriptor 1 checksum is invalid. FIXED.
+ Group descriptor 2 checksum is invalid. FIXED.
+ Group descriptor 3 checksum is invalid. FIXED.
++Disable extra_isize feature since filesystem has 128 byte inodes.
+ Pass 1: Checking inodes, blocks, and sizes
+ Relocating group 1's inode table to 142...
+ Restarting e2fsck from the beginning...
diff --git a/debian/patches/e2fsprogs-extents.patch b/debian/patches/e2fsprogs-extents.patch
index a18747c..d2a6cc3 100644
--- a/debian/patches/e2fsprogs-extents.patch
+++ b/debian/patches/e2fsprogs-extents.patch
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.41.4/e2fsck/pass1.c
+Index: e2fsprogs-1.41.9/e2fsck/pass1.c
===================================================================
---- e2fsprogs-1.41.4.orig/e2fsck/pass1.c
-+++ e2fsprogs-1.41.4/e2fsck/pass1.c
+--- e2fsprogs-1.41.9.orig/e2fsck/pass1.c
++++ e2fsprogs-1.41.9/e2fsck/pass1.c
@@ -137,7 +137,7 @@ int e2fsck_pass1_check_device_inode(ext2
* If the index flag is set, then this is a bogus
* device/fifo/socket
@@ -20,7 +20,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
return 0;
if (inode->i_flags & EXT4_EXTENTS_FL) {
-@@ -1004,8 +1004,7 @@ void e2fsck_pass1(e2fsck_t ctx)
+@@ -1008,8 +1008,7 @@ void e2fsck_pass1(e2fsck_t ctx)
check_blocks(ctx, &pctx, block_buf);
continue;
}
@@ -30,7 +30,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
e2fsck_pass1_check_device_inode(fs, inode)) {
check_immutable(ctx, &pctx);
check_size(ctx, &pctx);
-@@ -1627,6 +1626,31 @@ void e2fsck_clear_inode(e2fsck_t ctx, ex
+@@ -1626,6 +1625,31 @@ void e2fsck_clear_inode(e2fsck_t ctx, ex
e2fsck_write_inode(ctx, ino, inode, source);
}
@@ -62,7 +62,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
struct process_block_struct *pb,
blk64_t start_block,
-@@ -1644,8 +1668,8 @@ static void scan_extent_node(e2fsck_t ct
+@@ -1643,8 +1667,8 @@ static void scan_extent_node(e2fsck_t ct
if (pctx->errcode)
return;
@@ -73,7 +73,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
while (!pctx->errcode && info.num_entries-- > 0) {
is_leaf = extent.e_flags & EXT2_EXTENT_FLAGS_LEAF;
is_dir = LINUX_S_ISDIR(pctx->inode->i_mode);
-@@ -1673,9 +1697,9 @@ static void scan_extent_node(e2fsck_t ct
+@@ -1672,9 +1696,9 @@ static void scan_extent_node(e2fsck_t ct
pctx->str = "ext2fs_extent_delete";
return;
}
@@ -86,7 +86,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
if (pctx->errcode == EXT2_ET_NO_CURRENT_NODE) {
pctx->errcode = 0;
break;
-@@ -1687,8 +1711,8 @@ static void scan_extent_node(e2fsck_t ct
+@@ -1686,8 +1710,8 @@ static void scan_extent_node(e2fsck_t ct
if (!is_leaf) {
blk = extent.e_pblk;
@@ -97,7 +97,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
if (pctx->errcode) {
pctx->str = "EXT2_EXTENT_DOWN";
problem = PR_1_EXTENT_HEADER_INVALID;
-@@ -1699,8 +1723,8 @@ static void scan_extent_node(e2fsck_t ct
+@@ -1698,8 +1722,8 @@ static void scan_extent_node(e2fsck_t ct
scan_extent_node(ctx, pctx, pb, extent.e_lblk, ehandle);
if (pctx->errcode)
return;
@@ -108,7 +108,7 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
if (pctx->errcode) {
pctx->str = "EXT2_EXTENT_UP";
return;
-@@ -1754,9 +1778,9 @@ static void scan_extent_node(e2fsck_t ct
+@@ -1753,9 +1777,9 @@ static void scan_extent_node(e2fsck_t ct
if (!(extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT))
pb->last_block = start_block;
next:
@@ -121,11 +121,11 @@ Index: e2fsprogs-1.41.4/e2fsck/pass1.c
}
if (pctx->errcode == EXT2_ET_EXTENT_NO_NEXT)
pctx->errcode = 0;
-Index: e2fsprogs-1.41.4/e2fsck/problem.c
+Index: e2fsprogs-1.41.9/e2fsck/problem.c
===================================================================
---- e2fsprogs-1.41.4.orig/e2fsck/problem.c
-+++ e2fsprogs-1.41.4/e2fsck/problem.c
-@@ -868,6 +868,21 @@ static struct e2fsck_problem problem_tab
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.c
++++ e2fsprogs-1.41.9/e2fsck/problem.c
+@@ -890,6 +890,21 @@ static struct e2fsck_problem problem_tab
N_("@a in @i %i is corrupt (@n value)."),
PROMPT_CLEAR, 0},
@@ -147,27 +147,27 @@ Index: e2fsprogs-1.41.4/e2fsck/problem.c
/* Pass 1b errors */
/* Pass 1B: Rescan for duplicate/bad blocks */
-@@ -1631,6 +1655,7 @@ static struct latch_descr pr_latch_info[
- { PR_LATCH_LOW_DTIME, PR_1_ORPHAN_LIST_REFUGEES, 0 },
+@@ -1656,6 +1671,7 @@ static struct latch_descr pr_latch_info[
{ PR_LATCH_TOOBIG, PR_1_INODE_TOOBIG, 0 },
{ PR_LATCH_OPTIMIZE_DIR, PR_3A_OPTIMIZE_DIR_HEADER, PR_3A_OPTIMIZE_DIR_END },
+ { PR_LATCH_BG_CHECKSUM, PR_0_GDT_CSUM_LATCH, 0 },
+ { PR_LATCH_EXTENT_HI, PR_1_EXTENT_HI_LATCH, 0 },
{ -1, 0, 0 },
};
-Index: e2fsprogs-1.41.4/e2fsck/problem.h
+Index: e2fsprogs-1.41.9/e2fsck/problem.h
===================================================================
---- e2fsprogs-1.41.4.orig/e2fsck/problem.h
-+++ e2fsprogs-1.41.4/e2fsck/problem.h
-@@ -38,6 +38,7 @@ struct problem_context {
- #define PR_LATCH_LOW_DTIME 0x0070 /* Latch for pass1 orphaned list refugees */
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.h
++++ e2fsprogs-1.41.9/e2fsck/problem.h
+@@ -39,6 +39,7 @@ struct problem_context {
#define PR_LATCH_TOOBIG 0x0080 /* Latch for file to big errors */
#define PR_LATCH_OPTIMIZE_DIR 0x0090 /* Latch for optimize directories */
-+#define PR_LATCH_EXTENT_HI 0x00A0 /* Latch for extent high bits set */
+ #define PR_LATCH_BG_CHECKSUM 0x00A0 /* Latch for block group checksums */
++#define PR_LATCH_EXTENT_HI 0x00B0 /* Latch for extent high bits set */
#define PR_LATCH(x) ((((x) & PR_LATCH_MASK) >> 4) - 1)
-@@ -506,6 +507,15 @@ struct problem_context {
+@@ -520,6 +521,15 @@ struct problem_context {
/* Bad extended attribute value in inode */
#define PR_1_INODE_EA_BAD_VALUE 0x010060
@@ -183,11 +183,11 @@ Index: e2fsprogs-1.41.4/e2fsck/problem.h
/*
* Pass 1b errors
*/
-Index: e2fsprogs-1.41.4/lib/ext2fs/swapfs.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/swapfs.c
===================================================================
---- e2fsprogs-1.41.4.orig/lib/ext2fs/swapfs.c
-+++ e2fsprogs-1.41.4/lib/ext2fs/swapfs.c
-@@ -225,11 +225,13 @@ void ext2fs_swap_inode_full(ext2_filsys
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/swapfs.c
++++ e2fsprogs-1.41.9/lib/ext2fs/swapfs.c
+@@ -226,11 +226,13 @@ void ext2fs_swap_inode_full(ext2_filsys
if (bufsize < (int) (sizeof(struct ext2_inode) + sizeof(__u16)))
return; /* no i_extra_isize field */
@@ -204,10 +204,10 @@ Index: e2fsprogs-1.41.4/lib/ext2fs/swapfs.c
if (extra_isize > EXT2_INODE_SIZE(fs->super) -
sizeof(struct ext2_inode)) {
/* this is error case: i_extra_size is too large */
-Index: e2fsprogs-1.41.4/lib/ext2fs/valid_blk.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/valid_blk.c
===================================================================
---- e2fsprogs-1.41.4.orig/lib/ext2fs/valid_blk.c
-+++ e2fsprogs-1.41.4/lib/ext2fs/valid_blk.c
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/valid_blk.c
++++ e2fsprogs-1.41.9/lib/ext2fs/valid_blk.c
@@ -19,6 +19,7 @@
#include "ext2_fs.h"
@@ -242,10 +242,10 @@ Index: e2fsprogs-1.41.4/lib/ext2fs/valid_blk.c
if (inode->i_size > 4 && inode->i_block[1] == 0)
return 1; /* definitely using i_block[] */
return 0; /* Probably a fast symlink */
-Index: e2fsprogs-1.41.4/tests/f_extents/expect.1
+Index: e2fsprogs-1.41.9/tests/f_extents/expect.1
===================================================================
---- e2fsprogs-1.41.4.orig/tests/f_extents/expect.1
-+++ e2fsprogs-1.41.4/tests/f_extents/expect.1
+--- e2fsprogs-1.41.9.orig/tests/f_extents/expect.1
++++ e2fsprogs-1.41.9/tests/f_extents/expect.1
@@ -2,51 +2,68 @@ Pass 1: Checking inodes, blocks, and siz
Inode 12 is in extent format, but superblock is missing EXTENTS feature
Fix? yes
@@ -331,10 +331,10 @@ Index: e2fsprogs-1.41.4/tests/f_extents/expect.1
-test_filesys: 18/256 files (0.0% non-contiguous), 1094/8192 blocks
+test_filesys: 17/256 files (11.8% non-contiguous), 1127/8192 blocks
Exit status is 1
-Index: e2fsprogs-1.41.4/tests/f_extents/expect.2
+Index: e2fsprogs-1.41.9/tests/f_extents/expect.2
===================================================================
---- e2fsprogs-1.41.4.orig/tests/f_extents/expect.2
-+++ e2fsprogs-1.41.4/tests/f_extents/expect.2
+--- e2fsprogs-1.41.9.orig/tests/f_extents/expect.2
++++ e2fsprogs-1.41.9/tests/f_extents/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
@@ -342,10 +342,10 @@ Index: e2fsprogs-1.41.4/tests/f_extents/expect.2
-test_filesys: 18/256 files (0.0% non-contiguous), 1094/8192 blocks
+test_filesys: 17/256 files (11.8% non-contiguous), 1127/8192 blocks
Exit status is 0
-Index: e2fsprogs-1.41.4/tests/f_fast_symlink_extents/expect.1
+Index: e2fsprogs-1.41.9/tests/f_fast_symlink_extents/expect.1
===================================================================
---- e2fsprogs-1.41.4.orig/tests/f_fast_symlink_extents/expect.1
-+++ e2fsprogs-1.41.4/tests/f_fast_symlink_extents/expect.1
+--- e2fsprogs-1.41.9.orig/tests/f_fast_symlink_extents/expect.1
++++ e2fsprogs-1.41.9/tests/f_fast_symlink_extents/expect.1
@@ -1,11 +1,23 @@
Pass 1: Checking inodes, blocks, and sizes
-Fast symlink 13 has EXTENT_FL set. Clear? yes
@@ -372,10 +372,10 @@ Index: e2fsprogs-1.41.4/tests/f_fast_symlink_extents/expect.1
-test_filesys: 13/16 files (0.0% non-contiguous), 21/100 blocks
+test_filesys: 12/16 files (0.0% non-contiguous), 21/100 blocks
Exit status is 1
-Index: e2fsprogs-1.41.4/tests/f_fast_symlink_extents/expect.2
+Index: e2fsprogs-1.41.9/tests/f_fast_symlink_extents/expect.2
===================================================================
---- e2fsprogs-1.41.4.orig/tests/f_fast_symlink_extents/expect.2
-+++ e2fsprogs-1.41.4/tests/f_fast_symlink_extents/expect.2
+--- e2fsprogs-1.41.9.orig/tests/f_fast_symlink_extents/expect.2
++++ e2fsprogs-1.41.9/tests/f_fast_symlink_extents/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
diff --git a/debian/patches/e2fsprogs-fid_in_dirent.patch b/debian/patches/e2fsprogs-fid_in_dirent.patch
new file mode 100644
index 0000000..ca75c7f
--- /dev/null
+++ b/debian/patches/e2fsprogs-fid_in_dirent.patch
@@ -0,0 +1,578 @@
+Index: e2fsprogs-1.41.9/lib/blkid/probe.h
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/blkid/probe.h
++++ e2fsprogs-1.41.9/lib/blkid/probe.h
+@@ -119,6 +119,7 @@ struct ext2_super_block {
+ #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
+ #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
++#define EXT2_FEATURE_INCOMPAT_DIRDATA 0x1000
+
+ #define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+Index: e2fsprogs-1.41.9/lib/e2p/feature.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/e2p/feature.c
++++ e2fsprogs-1.41.9/lib/e2p/feature.c
+@@ -75,6 +75,8 @@ static struct feature feature_list[] = {
+ "flex_bg"},
+ { E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_MMP,
+ "mmp" },
++ { E2P_FEATURE_INCOMPAT, EXT2_FEATURE_INCOMPAT_DIRDATA,
++ "dirdata" },
+ { 0, 0, 0 },
+ };
+
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2_fs.h
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2_fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2_fs.h
+@@ -650,17 +650,31 @@ struct ext2_super_block {
+ #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
+ #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
+-
++#define EXT2_FEATURE_INCOMPAT_DIRDATA 0x1000
+
+ #define EXT2_FEATURE_COMPAT_SUPP 0
+-#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
+- EXT4_FEATURE_INCOMPAT_MMP)
++#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
++ EXT4_FEATURE_INCOMPAT_MMP| \
++ EXT2_FEATURE_INCOMPAT_DIRDATA)
+ #define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
+ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
+ EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+
++#define EXT2_FT_MASK 0x0f
++
++/* lu_fid size and NUL char */
++#define EXT2_DIRENT_LUFID_SIZE (17 + 1)
++#define EXT2_DIRENT_LUFID 0x10
++#define EXT2_DIR_PAD 4
++#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
++#define __EXT2_DIR_REC_LEN(len) (((len) + 8 + EXT2_DIR_ROUND) & \
++ ~EXT2_DIR_ROUND)
++
++#define EXT2_DIR_REC_LEN(de) (__EXT2_DIR_REC_LEN(de->name_len +\
++ ext2_get_dirent_size(de)))
++
+ /*
+ * Default values for user and/or group using reserved blocks
+ */
+@@ -722,16 +736,6 @@ struct ext2_dir_entry_2 {
+ #define EXT2_FT_MAX 8
+
+ /*
+- * EXT2_DIR_PAD defines the directory entries boundaries
+- *
+- * NOTE: It must be a multiple of 4
+- */
+-#define EXT2_DIR_PAD 4
+-#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
+-#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
+- ~EXT2_DIR_ROUND)
+-
+-/*
+ * This structure will be used for multiple mount protection. It will be
+ * written into the block number saved in the s_mmp_block field in the
+ * superblock. Programs that check MMP should assume that if SEQ_FSCK
+@@ -764,4 +768,7 @@ struct mmp_struct {
+ */
+ #define EXT2_MMP_MIN_CHECK_INTERVAL 5
+
++int ext2_get_dirent_dirdata_size(struct ext2_dir_entry_2 *de, char dirdata_flags);
++int ext2_get_dirent_size(struct ext2_dir_entry_2 *de);
++
+ #endif /* _LINUX_EXT2_FS_H */
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
+@@ -553,7 +553,8 @@ typedef struct ext2_icount *ext2_icount_
+ EXT3_FEATURE_INCOMPAT_RECOVER|\
+ EXT3_FEATURE_INCOMPAT_EXTENTS|\
+ EXT4_FEATURE_INCOMPAT_FLEX_BG|\
+- EXT4_FEATURE_INCOMPAT_MMP)
++ EXT4_FEATURE_INCOMPAT_MMP| \
++ EXT2_FEATURE_INCOMPAT_DIRDATA)
+ #else
+ #define EXT2_LIB_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE|\
+ EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|\
+@@ -561,7 +562,8 @@ typedef struct ext2_icount *ext2_icount_
+ EXT3_FEATURE_INCOMPAT_RECOVER|\
+ EXT3_FEATURE_INCOMPAT_EXTENTS|\
+ EXT4_FEATURE_INCOMPAT_FLEX_BG|\
+- EXT4_FEATURE_INCOMPAT_MMP)
++ EXT4_FEATURE_INCOMPAT_MMP| \
++ EXT2_FEATURE_INCOMPAT_DIRDATA)
+ #endif
+ #define EXT2_LIB_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER|\
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE|\
+@@ -1428,6 +1430,24 @@ _INLINE_ unsigned int ext2fs_div_ceil(un
+ return 0;
+ return ((a - 1) / b) + 1;
+ }
++
++_INLINE_ struct ext2_dx_root_info* get_ext2_dx_root_info(ext2_filsys fs, char *buf)
++{
++ struct ext2_dir_entry_2 * de = (struct ext2_dir_entry_2 *) buf;
++
++ if (!(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_DIRDATA))
++ return (struct ext2_dx_root_info *)(buf +
++ __EXT2_DIR_REC_LEN(1) +__EXT2_DIR_REC_LEN(2));
++
++ /* get dotdot first */
++ de = (struct ext2_dir_entry_2 *)((char *)de + de->rec_len);
++
++ /* dx root info is after dotdot entry */
++ de = (struct ext2_dir_entry_2 *)((char *)de + EXT2_DIR_REC_LEN(de));
++
++ return (struct ext2_dx_root_info*) de;
++}
++
+ #undef _INLINE_
+ #endif
+
+Index: e2fsprogs-1.41.9/misc/mke2fs.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/misc/mke2fs.c
++++ e2fsprogs-1.41.9/misc/mke2fs.c
+@@ -843,7 +843,8 @@ static __u32 ok_features[3] = {
+ EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|
+ EXT2_FEATURE_INCOMPAT_META_BG|
+ EXT4_FEATURE_INCOMPAT_FLEX_BG|
+- EXT4_FEATURE_INCOMPAT_MMP,
++ EXT4_FEATURE_INCOMPAT_MMP|
++ EXT2_FEATURE_INCOMPAT_DIRDATA,
+ /* R/O compat */
+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE|
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
+Index: e2fsprogs-1.41.9/misc/tune2fs.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/misc/tune2fs.c
++++ e2fsprogs-1.41.9/misc/tune2fs.c
+@@ -125,7 +125,8 @@ static __u32 ok_features[3] = {
+ EXT2_FEATURE_INCOMPAT_FILETYPE |
+ EXT3_FEATURE_INCOMPAT_EXTENTS |
+ EXT4_FEATURE_INCOMPAT_FLEX_BG |
+- EXT4_FEATURE_INCOMPAT_MMP,
++ EXT4_FEATURE_INCOMPAT_MMP|
++ EXT2_FEATURE_INCOMPAT_DIRDATA,
+ /* R/O compat */
+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE |
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
+@@ -143,7 +144,8 @@ static __u32 clear_ok_features[3] = {
+ /* Incompat */
+ EXT2_FEATURE_INCOMPAT_FILETYPE |
+ EXT4_FEATURE_INCOMPAT_FLEX_BG |
+- EXT4_FEATURE_INCOMPAT_MMP,
++ EXT4_FEATURE_INCOMPAT_MMP|
++ EXT2_FEATURE_INCOMPAT_DIRDATA,
+ /* R/O compat */
+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE |
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
+Index: e2fsprogs-1.41.9/e2fsck/pass1.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/e2fsck/pass1.c
++++ e2fsprogs-1.41.9/e2fsck/pass1.c
+@@ -1842,7 +1842,7 @@ static int handle_htree(e2fsck_t ctx, st
+ }
+
+ /* XXX should check that beginning matches a directory */
+- root = (struct ext2_dx_root_info *) (block_buf + 24);
++ root = get_ext2_dx_root_info(fs, block_buf);
+
+ if ((root->reserved_zero || root->info_length < 8) &&
+ fix_problem(ctx, PR_1_HTREE_BADROOT, pctx))
+Index: e2fsprogs-1.41.9/e2fsck/pass2.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/e2fsck/pass2.c
++++ e2fsprogs-1.41.9/e2fsck/pass2.c
+@@ -335,13 +335,82 @@ static EXT2_QSORT_TYPE special_dir_block
+ return (int) (db_a->blockcnt - db_b->blockcnt);
+ }
+
++void ext2_fix_dirent_dirdata(struct ext2_dir_entry_2 *de)
++{
++ int i = 0, dirdatalen, rlen;
++ __u8 flags = 0, new_flag = 0;
++ __u8 de_flags = de->file_type & ~EXT2_FT_MASK;
++
++ while (i < 4) {
++
++ flags = new_flag | (1 << i) << 4;
++
++ if ((de_flags & flags) == flags) {
++
++ dirdatalen = ext2_get_dirent_dirdata_size(de, flags);
++ rlen = __EXT2_DIR_REC_LEN(de->name_len + dirdatalen);
++
++ if (rlen > de->rec_len)
++ break;
++
++ new_flag |= flags;
++ }
++ i++;
++ }
++
++ de->file_type = (de->file_type & EXT2_FT_MASK) | new_flag;
++}
++
++
++/*
++ * check for dirent data in ext3 dirent.
++ * return 0 if dirent data is ok.
++ * return 1 if dirent data does not exist.
++ * return 2 if dirent was modified due to error.
++ */
++int e2fsck_check_dirent_data(e2fsck_t ctx, struct ext2_dir_entry_2 *de,
++ unsigned int offset, struct problem_context *pctx)
++{
++ if (!(ctx->fs->super->s_feature_incompat &
++ EXT2_FEATURE_INCOMPAT_DIRDATA)) {
++ if (de->file_type & ~EXT2_FT_MASK) {
++ /* clear dirent extra data flags. */
++ if (fix_problem(ctx, PR_2_CLEAR_DIRDATA, pctx)) {
++ de->file_type &= EXT2_FT_MASK;
++ return 2;
++ }
++ }
++ return 1;
++ }
++ if (de->file_type & ~EXT2_FT_MASK) {
+
++ if (de->rec_len >= EXT2_DIR_REC_LEN(de) ||
++ (de->rec_len + offset == EXT2_BLOCK_SIZE(ctx->fs->super))) {
++ if (ext2_get_dirent_dirdata_size(de, EXT2_DIRENT_LUFID) ==
++ EXT2_DIRENT_LUFID_SIZE)
++ return 0;
++ }
++ /* just clear dirent data flags for now, we should fix FID data
++ * in lustre specific pass.
++ */
++ if (fix_problem(ctx, PR_2_CLEAR_DIRDATA, pctx)) {
++ ext2_fix_dirent_dirdata(de);
++ if (ext2_get_dirent_dirdata_size(de, EXT2_DIRENT_LUFID) !=
++ EXT2_DIRENT_LUFID_SIZE) {
++ de->file_type &= ~EXT2_DIRENT_LUFID;
++ }
++
++ return 2;
++ }
++ }
++ return 1;
++}
+ /*
+ * Make sure the first entry in the directory is '.', and that the
+ * directory entry is sane.
+ */
+ static int check_dot(e2fsck_t ctx,
+- struct ext2_dir_entry *dirent,
++ struct ext2_dir_entry *dirent, unsigned int offset,
+ ext2_ino_t ino, struct problem_context *pctx)
+ {
+ struct ext2_dir_entry *nextdir;
+@@ -349,6 +418,7 @@ static int check_dot(e2fsck_t ctx,
+ int status = 0;
+ int created = 0;
+ int problem = 0;
++ int dir_data_error;
+
+ if (!dirent->inode)
+ problem = PR_2_MISSING_DOT;
+@@ -358,10 +428,14 @@ static int check_dot(e2fsck_t ctx,
+ else if (dirent->name[1] != '\0')
+ problem = PR_2_DOT_NULL_TERM;
+
++ dir_data_error = e2fsck_check_dirent_data(ctx,
++ (struct ext2_dir_entry_2 *)dirent,
++ offset, pctx);
++
+ (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
+ if (problem) {
+ if (fix_problem(ctx, problem, pctx)) {
+- if (rec_len < 12)
++ if (rec_len < 12 && dir_data_error)
+ rec_len = dirent->rec_len = 12;
+ dirent->inode = ino;
+ dirent->name_len = 1;
+@@ -377,7 +451,7 @@ static int check_dot(e2fsck_t ctx,
+ status = 1;
+ }
+ }
+- if (rec_len > 12) {
++ if (rec_len > 12 && dir_data_error) {
+ new_len = rec_len - 12;
+ if (new_len > 12) {
+ if (created ||
+@@ -402,10 +476,11 @@ static int check_dot(e2fsck_t ctx,
+ * here; this gets done in pass 3.
+ */
+ static int check_dotdot(e2fsck_t ctx,
+- struct ext2_dir_entry *dirent,
++ struct ext2_dir_entry *dirent, unsigned int offset,
+ ext2_ino_t ino, struct problem_context *pctx)
+ {
+ int rec_len, problem = 0;
++ int dir_data_error;
+
+ if (!dirent->inode)
+ problem = PR_2_MISSING_DOT_DOT;
+@@ -416,10 +491,14 @@ static int check_dotdot(e2fsck_t ctx,
+ else if (dirent->name[2] != '\0')
+ problem = PR_2_DOT_DOT_NULL_TERM;
+
++ dir_data_error = e2fsck_check_dirent_data(ctx,
++ (struct ext2_dir_entry_2 *)dirent,
++ offset, pctx);
++
+ (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
+ if (problem) {
+ if (fix_problem(ctx, problem, pctx)) {
+- if (rec_len < 12)
++ if (rec_len < 12 && dir_data_error)
+ dirent->rec_len = 12;
+ /*
+ * Note: we don't have the parent inode just
+@@ -481,6 +560,12 @@ static _INLINE_ int check_filetype(e2fsc
+ int should_be = EXT2_FT_UNKNOWN;
+ __u16 result;
+ struct ext2_inode inode;
++ __u8 dirdata = 0;
++
++ if (ctx->fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_DIRDATA) {
++ dirdata = filetype & ~EXT2_FT_MASK;
++ filetype = filetype & EXT2_FT_MASK;
++ }
+
+ if (!(ctx->fs->super->s_feature_incompat &
+ EXT2_FEATURE_INCOMPAT_FILETYPE)) {
+@@ -515,7 +600,7 @@ static _INLINE_ int check_filetype(e2fsc
+ pctx) == 0)
+ return 0;
+
+- dirent->name_len = (dirent->name_len & 0xFF) | should_be << 8;
++ dirent->name_len = ((dirent->name_len & 0xFF) | (dirdata | should_be) << 8);
+ return 1;
+ }
+
+@@ -537,7 +622,7 @@ static void parse_int_node(ext2_filsys f
+ ext2_dirhash_t hash = 0, prev_hash;
+
+ if (db->blockcnt == 0) {
+- root = (struct ext2_dx_root_info *) (block_buf + 24);
++ root = get_ext2_dx_root_info(fs, block_buf);
+
+ #ifdef DX_DEBUG
+ printf("Root node dump:\n");
+@@ -548,7 +633,7 @@ static void parse_int_node(ext2_filsys f
+ printf("\t Flags: %d\n", root->unused_flags);
+ #endif
+
+- ent = (struct ext2_dx_entry *) (block_buf + 24 + root->info_length);
++ ent = (struct ext2_dx_entry *) ((char *) root + root->info_length);
+ } else {
+ ent = (struct ext2_dx_entry *) (block_buf+8);
+ }
+@@ -812,7 +897,7 @@ static int check_dir_block(ext2_filsys f
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
+ limit = (struct ext2_dx_countlimit *) (buf+8);
+ if (db->blockcnt == 0) {
+- root = (struct ext2_dx_root_info *) (buf + 24);
++ root = get_ext2_dx_root_info(fs, buf);
+ dx_db->type = DX_DIRBLOCK_ROOT;
+ dx_db->flags |= DX_FLAG_FIRST | DX_FLAG_LAST;
+ if ((root->reserved_zero ||
+@@ -869,10 +954,10 @@ out_htree:
+ }
+
+ if (dot_state == 0) {
+- if (check_dot(ctx, dirent, ino, &cd->pctx))
++ if (check_dot(ctx, dirent, offset, ino, &cd->pctx))
+ dir_modified++;
+ } else if (dot_state == 1) {
+- ret = check_dotdot(ctx, dirent, ino, &cd->pctx);
++ ret = check_dotdot(ctx, dirent, offset, ino, &cd->pctx);
+ if (ret < 0)
+ goto abort_free_dict;
+ if (ret)
+@@ -888,6 +973,11 @@ out_htree:
+ if (!dirent->inode)
+ goto next;
+
++ ret = e2fsck_check_dirent_data(ctx, (struct ext2_dir_entry_2 *)dirent,
++ offset, &cd->pctx);
++ if (ret == 2)
++ dir_modified++;
++
+ /*
+ * Make sure the inode listed is a legal one.
+ */
+Index: e2fsprogs-1.41.9/e2fsck/pass3.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/e2fsck/pass3.c
++++ e2fsprogs-1.41.9/e2fsck/pass3.c
+@@ -606,6 +606,7 @@ static int fix_dotdot_proc(struct ext2_d
+ struct fix_dotdot_struct *fp = (struct fix_dotdot_struct *) priv_data;
+ errcode_t retval;
+ struct problem_context pctx;
++ __u16 dirdata = 0;
+
+ if ((dirent->name_len & 0xFF) != 2)
+ return 0;
+@@ -625,6 +626,9 @@ static int fix_dotdot_proc(struct ext2_d
+ fix_problem(fp->ctx, PR_3_ADJUST_INODE, &pctx);
+ }
+ dirent->inode = fp->parent;
++
++ dirdata = dirent->name_len & (~EXT2_FT_MASK << 8);
++
+ if (fp->ctx->fs->super->s_feature_incompat &
+ EXT2_FEATURE_INCOMPAT_FILETYPE)
+ dirent->name_len = (dirent->name_len & 0xFF) |
+@@ -632,6 +636,9 @@ static int fix_dotdot_proc(struct ext2_d
+ else
+ dirent->name_len = dirent->name_len & 0xFF;
+
++ if (fp->ctx->fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_DIRDATA)
++ dirent->name_len |= dirdata;
++
+ fp->done++;
+ return DIRENT_ABORT | DIRENT_CHANGED;
+ }
+Index: e2fsprogs-1.41.9/e2fsck/problem.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.c
++++ e2fsprogs-1.41.9/e2fsck/problem.c
+@@ -1391,6 +1391,11 @@ static struct e2fsck_problem problem_tab
+ N_("@i %i is badly corrupt (badness value = %N). "),
+ PROMPT_CLEAR, PR_PREEN_OK },
+
++ /* Directory dirdata flag set */
++ { PR_2_CLEAR_DIRDATA,
++ N_("@E dirdata length set incorrectly.\n"),
++ PROMPT_CLEAR, PR_PREEN_OK },
++
+ /* Pass 3 errors */
+
+ /* Pass 3: Checking directory connectivity */
+Index: e2fsprogs-1.41.9/e2fsck/problem.h
+===================================================================
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.h
++++ e2fsprogs-1.41.9/e2fsck/problem.h
+@@ -836,6 +836,9 @@ struct problem_context {
+ /* Inode completely corrupt */
+ #define PR_2_INODE_TOOBAD 0x020049
+
++/* Directory dirdata flag set */
++#define PR_2_CLEAR_DIRDATA 0x02f000
++
+ /*
+ * Pass 3 errors
+ */
+Index: e2fsprogs-1.41.9/e2fsck/rehash.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/e2fsck/rehash.c
++++ e2fsprogs-1.41.9/e2fsck/rehash.c
+@@ -148,7 +148,7 @@ static int fill_dir_block(ext2_filsys fs
+ }
+ ent = fd->harray + fd->num_array++;
+ ent->dir = dirent;
+- fd->dir_size += EXT2_DIR_REC_LEN(dirent->name_len & 0xFF);
++ fd->dir_size += __EXT2_DIR_REC_LEN(dirent->name_len & 0xFF);
+ ent->ino = dirent->inode;
+ if (fd->compress)
+ ent->hash = ent->minor_hash = 0;
+@@ -439,7 +439,7 @@ static errcode_t copy_dir_entries(e2fsck
+ ent = fd->harray + i;
+ if (ent->dir->inode == 0)
+ continue;
+- rec_len = EXT2_DIR_REC_LEN(ent->dir->name_len & 0xFF);
++ rec_len = __EXT2_DIR_REC_LEN(ent->dir->name_len & 0xFF);
+ if (rec_len > left) {
+ if (left) {
+ left += prev_rec_len;
+Index: e2fsprogs-1.41.9/lib/ext2fs/link.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/link.c
++++ e2fsprogs-1.41.9/lib/ext2fs/link.c
+@@ -41,7 +41,7 @@ static int link_proc(struct ext2_dir_ent
+ unsigned int rec_len, min_rec_len, curr_rec_len;
+ int ret = 0;
+
+- rec_len = EXT2_DIR_REC_LEN(ls->namelen);
++ rec_len = __EXT2_DIR_REC_LEN(ls->namelen);
+
+ ls->err = ext2fs_get_rec_len(ls->fs, dirent, &curr_rec_len);
+ if (ls->err)
+@@ -68,7 +68,7 @@ static int link_proc(struct ext2_dir_ent
+ * truncate it and return.
+ */
+ if (dirent->inode) {
+- min_rec_len = EXT2_DIR_REC_LEN(dirent->name_len & 0xFF);
++ min_rec_len = __EXT2_DIR_REC_LEN(dirent->name_len & 0xFF);
+ if (curr_rec_len < (min_rec_len + rec_len))
+ return ret;
+ rec_len = curr_rec_len - min_rec_len;
+Index: e2fsprogs-1.41.9/lib/ext2fs/newdir.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/newdir.c
++++ e2fsprogs-1.41.9/lib/ext2fs/newdir.c
+@@ -56,8 +56,8 @@ errcode_t ext2fs_new_dir_block(ext2_fils
+ dir->inode = dir_ino;
+ dir->name_len = 1 | filetype;
+ dir->name[0] = '.';
+- rec_len = fs->blocksize - EXT2_DIR_REC_LEN(1);
+- dir->rec_len = EXT2_DIR_REC_LEN(1);
++ rec_len = fs->blocksize - __EXT2_DIR_REC_LEN(1);
++ dir->rec_len = __EXT2_DIR_REC_LEN(1);
+
+ /*
+ * Set up entry for '..'
+Index: e2fsprogs-1.41.9/lib/ext2fs/dirblock.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/dirblock.c
++++ e2fsprogs-1.41.9/lib/ext2fs/dirblock.c
+@@ -19,6 +19,39 @@
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+
++/*
++ * Compute the total directory entry data length.
++ * This includes the filename and an implicit NUL terminator (always present),
++ * and optional extensions. Each extension has a bit set in the high 4 bits of
++ * de->file_type, and the extension length is the first byte in each entry.
++ */
++int ext2_get_dirent_size(struct ext2_dir_entry_2 *de)
++{
++ return ext2_get_dirent_dirdata_size(de, ~EXT2_FT_MASK);
++}
++
++int ext2_get_dirent_dirdata_size(struct ext2_dir_entry_2 *de, char dirdata_flags)
++{
++ char *len = de->name + de->name_len + 1 /* NUL terminator */;
++ int dlen = 0;
++ __u8 extra_data_flags = (de->file_type & ~EXT2_FT_MASK) >> 4;
++
++ dirdata_flags >>= 4;
++ while ((extra_data_flags & dirdata_flags) != 0) {
++ if (extra_data_flags & 1) {
++ if (dirdata_flags & 1)
++ dlen += *len;
++
++ len += *len;
++ }
++ extra_data_flags >>= 1;
++ dirdata_flags >>= 1;
++ }
++
++ /* add NUL terminator byte to dirdata length */
++ return dlen + (dlen != 0);
++}
++
+ errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
+ void *buf, int flags EXT2FS_ATTR((unused)))
+ {
diff --git a/debian/patches/e2fsprogs-fiemap-lustre.patch b/debian/patches/e2fsprogs-fiemap-lustre.patch
index fb526f5..b362403 100644
--- a/debian/patches/e2fsprogs-fiemap-lustre.patch
+++ b/debian/patches/e2fsprogs-fiemap-lustre.patch
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.41.6/lib/ext2fs/fiemap.h
+Index: e2fsprogs-1.41.9/lib/ext2fs/fiemap.h
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/fiemap.h 2009-05-02 00:17:35.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/fiemap.h 2009-06-13 06:28:33.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/fiemap.h
++++ e2fsprogs-1.41.9/lib/ext2fs/fiemap.h
@@ -21,7 +21,8 @@ struct fiemap_extent {
__u64 fe_length; /* length in bytes for this extent */
__u64 fe_reserved64[2];
@@ -30,20 +30,20 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/fiemap.h
+ * Sets NO_DIRECT flag */
+
#endif /* _LINUX_FIEMAP_H */
-Index: e2fsprogs-1.41.6/misc/filefrag.8.in
+Index: e2fsprogs-1.41.9/misc/filefrag.8.in
===================================================================
---- e2fsprogs-1.41.6.orig/misc/filefrag.8.in 2009-05-02 20:31:13.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/filefrag.8.in 2009-06-13 06:28:33.000000000 -0400
+--- e2fsprogs-1.41.9.orig/misc/filefrag.8.in
++++ e2fsprogs-1.41.9/misc/filefrag.8.in
@@ -5,7 +5,7 @@ filefrag \- report on file fragmentation
.SH SYNOPSIS
.B filefrag
[
--.B \-besvx
-+.B \-blsvx
+-.B \-Bbsvx
++.B \-Bblsvx
]
[
.I files...
-@@ -25,6 +25,8 @@ If FIEMAP is not supported then filefrag
+@@ -29,6 +29,8 @@ testing purposes.
.TP
.B \-b
Use 1024 byte blocksize for the output.
@@ -52,16 +52,17 @@ Index: e2fsprogs-1.41.6/misc/filefrag.8.in
.TP
.B \-s
Sync the file before requesting the mapping.
-Index: e2fsprogs-1.41.6/misc/filefrag.c
+Index: e2fsprogs-1.41.9/misc/filefrag.c
===================================================================
---- e2fsprogs-1.41.6.orig/misc/filefrag.c 2009-05-02 20:29:28.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/filefrag.c 2009-06-13 07:11:11.000000000 -0400
-@@ -46,16 +46,21 @@ int verbose = 0;
+--- e2fsprogs-1.41.9.orig/misc/filefrag.c
++++ e2fsprogs-1.41.9/misc/filefrag.c
+@@ -46,17 +46,22 @@ int verbose = 0;
int no_bs = 0; /* Don't use the files blocksize, use 1K blocksize */
int sync_file = 0; /* fsync file before getting the mapping */
int xattr_map = 0; /* get xattr mapping */
+int is_lustre = 0; /* Indicates lustre filesystem */
+int device_offset = 0; /* extents are in device offset order */
+ int force_bmap = 0;
int logical_width = 12;
int physical_width = 14;
unsigned long long filesize;
@@ -79,7 +80,7 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT3_IOC_GETFLAGS _IOR('f', 1, long)
-@@ -144,6 +149,8 @@ static void print_extent_info(struct fie
+@@ -143,6 +148,8 @@ static void print_extent_info(struct fie
strcat(flags, "unwritten,");
if (fm_extent->fe_flags & FIEMAP_EXTENT_MERGED)
strcat(flags, "merged,");
@@ -88,7 +89,7 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
if (fm_extent->fe_logical + fm_extent->fe_length >= filesize)
strcat(flags, "eof,");
-@@ -152,16 +159,11 @@ static void print_extent_info(struct fie
+@@ -151,16 +158,11 @@ static void print_extent_info(struct fie
if (flags[0])
flags[strlen(flags) - 1] = '\0';
@@ -109,14 +110,14 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
+ ext_len, fm_extent->fe_device, flags);
}
- int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
-@@ -175,12 +177,18 @@ int filefrag_fiemap(int fd, int blk_shif
- unsigned long flags = 0;
+ static int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
+@@ -176,12 +178,17 @@ static int filefrag_fiemap(int fd, int b
static int fiemap_incompat_printed;
+ int fiemap_header_printed = 0;
int tot_extents = 1, n = 0;
+ int previous_device = 0;
- int last = 0, eof = 0;
- int i, rc;
+ int last = 0;
+ int rc;
fiemap->fm_length = ~0ULL;
@@ -126,40 +127,43 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
+ * the first extent to pass the next starting offset and the device.
+ */
+ memset(fiemap, 0, sizeof(struct fiemap) + sizeof(struct fiemap_extent));
-+
if (!verbose)
count = 0;
-@@ -191,17 +199,24 @@ int filefrag_fiemap(int fd, int blk_shif
+@@ -192,6 +199,10 @@ static int filefrag_fiemap(int fd, int b
if (xattr_map)
flags |= FIEMAP_FLAG_XATTR;
+ if (device_offset)
+ flags |= FIEMAP_FLAG_DEVICE_ORDER;
+
- if (verbose)
-- printf(" ext %*s %*s %*s length flags\n", logical_width,
-- "logical", physical_width, "physical",
-- physical_width, "expected");
-+ printf(" ext: %*s %*s length: device: flags:\n", logical_width,
-+ is_lustre ? "device_logical:" : "logical:",
-+ physical_width, "physical:");
-
+retry_wo_device_offset:
do {
fiemap->fm_length = ~0ULL;
fiemap->fm_flags = flags;
- fiemap->fm_extent_count = count;
- rc = ioctl(fd, FS_IOC_FIEMAP, (unsigned long) fiemap);
-- if (rc == -EBADR) {
-+ if (rc == -EBADR && (fiemap->fm_flags & FIEMAP_FLAG_DEVICE_ORDER)) {
-+ flags &= ~FIEMAP_FLAG_DEVICE_ORDER;
-+ goto retry_wo_device_offset;
-+ } else if (rc == -EBADR) {
- if (fiemap_incompat_printed == 0) {
+@@ -202,14 +213,18 @@ static int filefrag_fiemap(int fd, int b
printf("FIEMAP failed with unsupported "
"flags %x\n", fiemap->fm_flags);
-@@ -228,6 +243,9 @@ int filefrag_fiemap(int fd, int blk_shif
+ fiemap_incompat_printed = 1;
++ } else if (rc == EBADR && (fiemap->fm_flags &
++ FIEMAP_FLAG_DEVICE_ORDER)) {
++ flags &= ~FIEMAP_FLAG_DEVICE_ORDER;
++ goto retry_wo_device_offset;
+ }
+ return rc;
+ }
+
+ if (verbose && !fiemap_header_printed) {
+- printf(" ext %*s %*s %*s length flags\n", logical_width,
+- "logical", physical_width, "physical",
+- physical_width, "expected");
++ printf(" ext: %*s %*s length: device: flags:\n",
++ logical_width, is_lustre ? "device_logical:" :
++ "logical:", physical_width, "physical:");
+ fiemap_header_printed = 1;
+ }
+
+@@ -230,6 +245,9 @@ static int filefrag_fiemap(int fd, int b
ext_len = fm_ext[i].fe_length >> blk_shift;
logical_blk = fm_ext[i].fe_logical >> blk_shift;
@@ -169,11 +173,12 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
if (logical_blk && phy_blk != last_blk + 1)
tot_extents++;
else
-@@ -240,8 +258,21 @@ int filefrag_fiemap(int fd, int blk_shif
+@@ -242,8 +260,21 @@ static int filefrag_fiemap(int fd, int b
n++;
}
-- fiemap->fm_start += fm_ext[i-1].fe_logical +
+- fiemap->fm_start = (fm_ext[i-1].fe_logical +
+- fm_ext[i-1].fe_length);
+ /* For DEVICE_ORDER mappings, if EXTENT_LAST is not yet found then
+ * fm_start needs to be the same as it was for earlier ioctl.
+ * The first extent is used to pass the end offset and device of
@@ -187,12 +192,12 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
+ fiemap->fm_start = 0;
+ } else {
+ fiemap->fm_start = fm_ext[i-1].fe_logical +
- fm_ext[i-1].fe_length;
++ fm_ext[i-1].fe_length;
+ }
} while (last == 0);
*num_extents = tot_extents;
-@@ -303,6 +334,18 @@ static void frag_report(const char *file
+@@ -304,6 +335,18 @@ static void frag_report(const char *file
printf("Filesystem type is: %lx\n",
(unsigned long) fsinfo.f_type);
@@ -211,31 +216,34 @@ Index: e2fsprogs-1.41.6/misc/filefrag.c
cylgroups = div_ceil(fsinfo.f_blocks, fsinfo.f_bsize*8);
if (verbose && is_ext2 && once)
printf("Filesystem cylinder groups is approximately %ld\n",
-@@ -329,7 +372,7 @@ static void frag_report(const char *file
+@@ -330,7 +373,7 @@ static void frag_report(const char *file
filesize = (long long)fileinfo.st_size;
if (verbose)
printf("File size of %s is %lld (%ld block%s, blocksize %d)\n",
- filename, (long long) fileinfo.st_size, numblocks,
+ filename, filesize, numblocks,
numblocks == 1 ? "" : "s", bs);
- if (filefrag_fiemap(fd, int_log2(bs), &num_extents) != 0) {
- for (i = 0; i < numblocks; i++) {
-@@ -371,7 +414,7 @@ static void frag_report(const char *file
+ if (force_bmap ||
+ filefrag_fiemap(fd, int_log2(bs), &num_extents) != 0) {
+@@ -376,7 +419,7 @@ static void frag_report(const char *file
static void usage(const char *progname)
{
-- fprintf(stderr, "Usage: %s [-bvsx] file ...\n", progname);
-+ fprintf(stderr, "Usage: %s [-blvsx] file ...\n", progname);
+- fprintf(stderr, "Usage: %s [-Bbvsx] file ...\n", progname);
++ fprintf(stderr, "Usage: %s [-Bblvsx] file ...\n", progname);
exit(1);
}
-@@ -381,14 +424,20 @@ int main(int argc, char**argv)
+@@ -385,7 +428,7 @@ int main(int argc, char**argv)
+ char **cpp;
int c;
- int ret;
-- while ((c = getopt(argc, argv, "bsvx")) != EOF)
-+ while ((c = getopt(argc, argv, "besvx")) != EOF)
+- while ((c = getopt(argc, argv, "Bbsvx")) != EOF)
++ while ((c = getopt(argc, argv, "Bblsvx")) != EOF)
switch (c) {
+ case 'B':
+ force_bmap++;
+@@ -393,9 +436,15 @@ int main(int argc, char**argv)
case 'b':
no_bs++;
break;
diff --git a/debian/patches/e2fsprogs-lazy_journal_init.patch b/debian/patches/e2fsprogs-lazy_journal_init.patch
new file mode 100644
index 0000000..81e580a
--- /dev/null
+++ b/debian/patches/e2fsprogs-lazy_journal_init.patch
@@ -0,0 +1,177 @@
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
+@@ -181,10 +181,9 @@ typedef struct ext2_file *ext2_file_t;
+
+ /*
+ * Flags for mkjournal
+- *
+- * EXT2_MKJOURNAL_V1_SUPER Make a (deprecated) V1 journal superblock
+ */
+-#define EXT2_MKJOURNAL_V1_SUPER 0x0000001
++#define EXT2_MKJOURNAL_V1_SUPER 0x0000001 /* create V1 superblock (deprecated) */
++#define EXT2_MKJOURNAL_LAZYINIT 0x0000002 /* don't zero journal inode before use*/
+
+ struct struct_ext2_filsys {
+ errcode_t magic;
+Index: e2fsprogs-1.41.9/lib/ext2fs/mkjournal.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/mkjournal.c
++++ e2fsprogs-1.41.9/lib/ext2fs/mkjournal.c
+@@ -103,7 +103,7 @@ static errcode_t write_journal_file(ext2
+ /* Open the device or journal file */
+ if ((fd = open(filename, O_WRONLY)) < 0) {
+ retval = errno;
+- goto errout;
++ goto errfree;
+ }
+
+ /* Write the superblock out */
+@@ -117,6 +117,9 @@ static errcode_t write_journal_file(ext2
+ goto errout;
+ memset(buf, 0, fs->blocksize);
+
++ if (flags & EXT2_MKJOURNAL_LAZYINIT)
++ goto success;
++
+ for (i = 1; i < size; i++) {
+ ret_size = write(fd, buf, fs->blocksize);
+ if (ret_size < 0) {
+@@ -126,10 +129,12 @@ static errcode_t write_journal_file(ext2
+ if (ret_size != (int) fs->blocksize)
+ goto errout;
+ }
+- close(fd);
+
++success:
+ retval = 0;
+ errout:
++ close(fd);
++errfree:
+ ext2fs_free_mem(&buf);
+ return retval;
+ }
+@@ -201,6 +206,7 @@ struct mkjournal_struct {
+ blk_t goal;
+ blk_t blk_to_zero;
+ int zero_count;
++ int flags;
+ char *buf;
+ errcode_t err;
+ };
+@@ -232,7 +238,7 @@ static int mkjournal_proc(ext2_filsys fs
+ retval = 0;
+ if (blockcnt <= 0)
+ retval = io_channel_write_blk(fs->io, new_blk, 1, es->buf);
+- else {
++ else if (!(es->flags & EXT2_MKJOURNAL_LAZYINIT)) {
+ if (es->zero_count) {
+ if ((es->blk_to_zero + es->zero_count == new_blk) &&
+ (es->zero_count < 1024))
+@@ -296,6 +302,7 @@ static errcode_t write_journal_inode(ext
+ es.newblocks = 0;
+ es.buf = buf;
+ es.err = 0;
++ es.flags = flags;
+ es.zero_count = 0;
+
+ if (fs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS) {
+@@ -490,6 +497,13 @@ errcode_t ext2fs_add_journal_inode(ext2_
+ if ((fd = open(jfile, O_CREAT|O_WRONLY, 0600)) < 0)
+ return errno;
+
++ /* Note that we can't do lazy journal initialization for mounted
++ * filesystems, since the zero writing is also allocating the
++ * journal blocks. We could use fallocate, but not all kernels
++ * support that, and creating a journal on a mounted ext2
++ * filesystems is extremely rare these days... Skip it. */
++ flags &= ~EXT2_MKJOURNAL_LAZYINIT;
++
+ if ((retval = write_journal_file(fs, jfile, size, flags)))
+ goto errout;
+
+Index: e2fsprogs-1.41.9/misc/mke2fs.8.in
+===================================================================
+--- e2fsprogs-1.41.9.orig/misc/mke2fs.8.in
++++ e2fsprogs-1.41.9/misc/mke2fs.8.in
+@@ -232,7 +232,15 @@ This speeds up filesystem
+ initialization noticeably, but it requires the kernel to finish
+ initializing the filesystem in the background when the filesystem is
+ first mounted. If the option value is omitted, it defaults to 1 to
+-enable lazy inode table initialization.
++enable lazy inode table zeroing.
++.TP
++.B lazy_journal_init\fR[\fB= \fI<0 to disable, 1 to enable>\fR]
++If enabled, the journal inode will not be fully zeroed out by
++.BR mke2fs .
++This speeds up filesystem initialization noticeably, but carries some
++small risk if the system crashes before the journal has been overwritten
++entirely one time. If the option value is omitted, it defaults to 1 to
++enable lazy journal inode zeroing.
+ .TP
+ .B test_fs
+ Set a flag in the filesystem superblock indicating that it may be
+Index: e2fsprogs-1.41.9/misc/mke2fs.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/misc/mke2fs.c
++++ e2fsprogs-1.41.9/misc/mke2fs.c
+@@ -551,6 +551,10 @@ static void create_journal_dev(ext2_fils
+ _("while initializing journal superblock"));
+ exit(1);
+ }
++
++ if (journal_flags & EXT2_MKJOURNAL_LAZYINIT)
++ goto write_superblock;
++
+ if (quiet)
+ memset(&progress, 0, sizeof(progress));
+ else
+@@ -578,6 +582,8 @@ static void create_journal_dev(ext2_fils
+ }
+ ext2fs_zero_blocks(0, 0, 0, 0, 0);
+
++ progress_close(&progress);
++write_superblock:
+ retval = io_channel_write_blk(fs->io,
+ fs->super->s_first_data_block+1,
+ 1, buf);
+@@ -586,7 +592,6 @@ static void create_journal_dev(ext2_fils
+ _("while writing journal superblock"));
+ exit(1);
+ }
+- progress_close(&progress);
+ }
+
+ static void show_stats(ext2_filsys fs)
+@@ -795,6 +800,12 @@ static void parse_extended_opts(struct e
+ }
+ } else if (!strcmp(token, "test_fs")) {
+ param->s_flags |= EXT2_FLAGS_TEST_FILESYS;
++ } else if (!strcmp(token, "lazy_journal_init")) {
++ if (arg)
++ journal_flags |= strtoul(arg, &p, 0) ?
++ EXT2_MKJOURNAL_LAZYINIT : 0;
++ else
++ journal_flags |= EXT2_MKJOURNAL_LAZYINIT;
+ } else if (!strcmp(token, "lazy_itable_init")) {
+ if (arg)
+ lazy_itable_init = strtoul(arg, &p, 0);
+@@ -815,6 +826,7 @@ static void parse_extended_opts(struct e
+ "\tstripe-width=<RAID stride * data disks in blocks>\n"
+ "\tresize=<resize maximum size in blocks>\n"
+ "\tlazy_itable_init=<0 to disable, 1 to enable>\n"
++ "\tlazy_journal_init=<0 to disable, 1 to enable>\n"
+ "\ttest_fs\n\n"),
+ badopt ? badopt : "");
+ free(buf);
+@@ -1637,6 +1649,9 @@ got_size:
+
+ lazy_itable_init = get_bool_from_profile(fs_types,
+ "lazy_itable_init", 0);
++ journal_flags |= get_bool_from_profile(fs_types,
++ "lazy_journal_init", 0) ?
++ EXT2_MKJOURNAL_LAZYINIT : 0;
+
+ /* Get options from profile */
+ for (cpp = fs_types; *cpp; cpp++) {
diff --git a/debian/patches/e2fsprogs-lfsck-absolute-path.patch b/debian/patches/e2fsprogs-lfsck-absolute-path.patch
new file mode 100644
index 0000000..f436007
--- /dev/null
+++ b/debian/patches/e2fsprogs-lfsck-absolute-path.patch
@@ -0,0 +1,119 @@
+Index: e2fsprogs-1.41.6/e2fsck/lfsck.c
+===================================================================
+--- e2fsprogs-1.41.6.orig/e2fsck/lfsck.c 2009-06-13 07:12:27.000000000 -0400
++++ e2fsprogs-1.41.6/e2fsck/lfsck.c 2009-07-14 16:09:07.000000000 -0400
+@@ -214,6 +214,31 @@ int get_lov_config()
+ return rc;
+ }
+
++static char *my_dirname(char *path)
++{
++
++ if (path != NULL) {
++ char *tmp = strrchr(path, '/');
++ if (tmp != NULL) {
++ *tmp = '\0';
++ return path;
++ }
++ }
++
++ return ".";
++}
++
++static const char *my_basename(const char *path)
++{
++ if (path != NULL) {
++ char *tmp = strrchr(path, '/');
++ if (tmp != NULL)
++ return tmp + 1;
++ }
++
++ return path;
++}
++
+ int parse_args(int argc, char *argv[])
+ {
+ int option_index = 0;
+@@ -234,6 +259,8 @@ int parse_args(int argc, char *argv[])
+ { 0, 0, 0, 0 }
+ };
+ struct mntent *mnt_info;
++ char tmp[PATH_MAX];
++ char *dbpath;
+ int c, found;
+ char *p1;
+ FILE *fp;
+@@ -262,11 +289,22 @@ int parse_args(int argc, char *argv[])
+ break;
+ case 'm':
+ VERBOSE(1, "MDSDB: %s\n", optarg);
+- mds_file = strdup(optarg);
+- if (mds_file == NULL) {
+- fprintf(stderr, "error allocating mds_file\n");
++ dbpath = malloc(PATH_MAX);
++ if (dbpath == NULL) {
++ fprintf(stderr, "error allocating dbpath\n");
+ return -ENOMEM;
+ }
++ strcpy(tmp, optarg);
++ if (realpath(my_dirname(tmp), dbpath) == NULL) {
++ fprintf(stderr, "Failure to resolve path %s\n",
++ optarg);
++ free(dbpath);
++ exit(1);
++ }
++
++ strcpy(tmp, optarg);
++ sprintf(dbpath+strlen(dbpath), "/%s", my_basename(tmp));
++ mds_file = dbpath;
+ break;
+ case 'n':
+ lfsck_create = 0;
+@@ -281,21 +319,40 @@ int parse_args(int argc, char *argv[])
+ }
+ /* Otherwise it is another ostdb file */
+ case 'o':
++ {
++ char *ost_path;
++
+ VERBOSE(1, "OSTDB[%u]: %s\n", num_ost_files, optarg);
+ p1 = optarg;
+ do {
+- /* Old-style arguments are comma separated */
+- ost_files[num_ost_files] =
+- strdup(strsep(&p1, ","));
+- if (ost_files[num_ost_files] == NULL) {
++ dbpath = malloc(PATH_MAX);
++ if (dbpath == NULL) {
+ fprintf(stderr,
+- "error allocate ost_files[%d]\n",
+- num_ost_files);
++ "error allocating dbpath\n");
+ return -ENOMEM;
+ }
++
++ /* Old-style arguments are comma separated */
++ ost_path = strsep(&p1, ",");
++ strcpy(tmp, ost_path);
++ if (realpath(my_dirname(tmp), dbpath) == NULL) {
++ fprintf(stderr, "Failure to resolve "
++ "path %s\n", optarg);
++ for (c = 0; c < num_ost_files; c++)
++ free(ost_files[c]);
++ free(dbpath);
++ exit(1);
++ }
++
++ strcpy(tmp, ost_path);
++ sprintf(dbpath+strlen(dbpath), "/%s",
++ my_basename(tmp));
++ ost_files[num_ost_files] = dbpath;
+ num_ost_files++;
+ } while (p1 != NULL);
++
+ break;
++ }
+ case 't':
+ num_threads = strtol(optarg, NULL, 0);
+ if (num_threads == ULONG_MAX)
+
diff --git a/debian/patches/e2fsprogs-lfsck.patch b/debian/patches/e2fsprogs-lfsck.patch
index b90da5d..96e2031 100644
--- a/debian/patches/e2fsprogs-lfsck.patch
+++ b/debian/patches/e2fsprogs-lfsck.patch
@@ -1,60 +1,5295 @@
add support for lustre lfsck tool
-Index: e2fsprogs-1.41.5/MCONFIG.in
+Index: e2fsprogs-1.41.10/MCONFIG.in
===================================================================
---- e2fsprogs-1.41.5.orig/MCONFIG.in
-+++ e2fsprogs-1.41.5/MCONFIG.in
-@@ -80,6 +80,8 @@ LIBINTL = @LIBINTL@
- DEPLIBSS = $(LIB)/libss at LIB_EXT@
- DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@
- DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
+--- e2fsprogs-1.41.10.orig/MCONFIG.in
++++ e2fsprogs-1.41.10/MCONFIG.in
+@@ -95,6 +95,9 @@ DEPLIBSS = $(LIB)/libss at LIB_EXT@
+ DEPLIBCOM_ERR = $(LIB)/libcom_err at LIB_EXT@
+ DEPLIBUUID = @DEPLIBUUID@
+ DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID)
+#Version of libdb lib found by configure
+LIBDB = @libdb@
++
STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@ @DLOPEN_LIB@
STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@ @SEM_INIT_LIB@
-Index: e2fsprogs-1.41.5/configure
+Index: e2fsprogs-1.41.10/configure
===================================================================
---- e2fsprogs-1.41.5.orig/configure
-+++ e2fsprogs-1.41.5/configure
-@@ -676,6 +676,9 @@ GREP
- EGREP
- LINUX_INCLUDE
- MAINTAINER_CMT
+--- e2fsprogs-1.41.10.orig/configure
++++ e2fsprogs-1.41.10/configure
+@@ -1,81 +1,60 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64.
++# Generated by GNU Autoconf 2.61.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
+-#
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## -------------------- ##
+-## M4sh Initialization. ##
+-## -------------------- ##
++## --------------------- ##
++## M4sh Initialization. ##
++## --------------------- ##
+
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in #(
+- *posix*) :
+- set -o posix ;; #(
+- *) :
+- ;;
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
+ esac
++
+ fi
+
+
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-# Prefer a ksh shell builtin over an external printf program on Solaris,
+-# but without wasting forks for bash or zsh.
+-if test -z "$BASH_VERSION$ZSH_VERSION" \
+- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+- as_echo='print -r --'
+- as_echo_n='print -rn --'
+-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
+- 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'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in #(
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
+- export as_echo_body
+- as_echo='sh -c $as_echo_body as_echo'
+-fi
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++ as_unset=unset
++else
++ as_unset=false
+ fi
+
+
+@@ -84,18 +63,20 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
++as_nl='
++'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-case $0 in #((
++case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+- done
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -106,270 +87,32 @@ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+- exit 1
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
+ fi
+
+-# 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
+-# trigger a bug in pdksh 5.2.14.
+-for as_var in BASH_ENV ENV MAIL MAILPATH
+-do eval test x\${$as_var+set} = xset \
+- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++# Work around bugs in pre-3.0 UWIN ksh.
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
+-
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-if test "x$CONFIG_SHELL" = x; then
+- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+- emulate sh
+- NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+- # is contrary to our usage. Disable this feature.
+- alias -g '\${1+\"\$@\"}'='\"\$@\"'
+- setopt NO_GLOB_SUBST
+-else
+- case \`(set -o) 2>/dev/null\` in #(
+- *posix*) :
+- set -o posix ;; #(
+- *) :
+- ;;
+-esac
+-fi
+-"
+- as_required="as_fn_return () { (exit \$1); }
+-as_fn_success () { as_fn_return 0; }
+-as_fn_failure () { as_fn_return 1; }
+-as_fn_ret_success () { return 0; }
+-as_fn_ret_failure () { return 1; }
+-
+-exitcode=0
+-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+-
+-else
+- exitcode=1; echo positional parameters were not saved.
+-fi
+-test x\$exitcode = x0 || exit 1"
+- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+-test \$(( 1 + 1 )) = 2 || exit 1"
+- if (eval "$as_required") 2>/dev/null; then :
+- as_have_required=yes
+-else
+- as_have_required=no
+-fi
+- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+-
+-else
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_found=false
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- as_found=:
+- case $as_dir in #(
+- /*)
+- for as_base in sh bash ksh sh5; do
+- # Try only shells that exist, to save several forks.
+- as_shell=$as_dir/$as_base
+- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+- CONFIG_SHELL=$as_shell as_have_required=yes
+- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+- break 2
+-fi
+-fi
+- done;;
+- esac
+- as_found=false
+-done
+-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+- CONFIG_SHELL=$SHELL as_have_required=yes
+-fi; }
+-IFS=$as_save_IFS
+-
+-
+- if test "x$CONFIG_SHELL" != x; then :
+- # We cannot yet assume a decent shell, so we have to provide a
+- # neutralization value for shells without unset; and this also
+- # works around shells that cannot unset nonexistent variables.
+- BASH_ENV=/dev/null
+- ENV=/dev/null
+- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+-fi
+-
+- if test x$as_have_required = xno; then :
+- $as_echo "$0: This script requires a shell more modern than all"
+- $as_echo "$0: the shells that I found on your system."
+- if test x${ZSH_VERSION+set} = xset ; then
+- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+- else
+- $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+-$0: including any error possibly output before this
+-$0: message. Then install a modern shell, or manually run
+-$0: the script under such a shell if you do have one."
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+- exit 1
+-fi
+-fi
+-fi
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-export SHELL
+-# Unset more variables known to interfere with behavior of common tools.
+-CLICOLOR_FORCE= GREP_OPTIONS=
+-unset CLICOLOR_FORCE GREP_OPTIONS
+-
+-## --------------------- ##
+-## M4sh Shell Functions. ##
+-## --------------------- ##
+-# as_fn_unset VAR
+-# ---------------
+-# Portably unset VAR.
+-as_fn_unset ()
+-{
+- { eval $1=; unset $1;}
+-}
+-as_unset=as_fn_unset
+-
+-# as_fn_set_status STATUS
+-# -----------------------
+-# Set $? to STATUS, without forking.
+-as_fn_set_status ()
+-{
+- return $1
+-} # as_fn_set_status
+-
+-# as_fn_exit STATUS
+-# -----------------
+-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+-as_fn_exit ()
+-{
+- set +e
+- as_fn_set_status $1
+- exit $1
+-} # as_fn_exit
+-
+-# as_fn_mkdir_p
+-# -------------
+-# Create "$as_dir" as a directory, including parents if necessary.
+-as_fn_mkdir_p ()
+-{
+-
+- case $as_dir in #(
+- -*) as_dir=./$as_dir;;
+- esac
+- test -d "$as_dir" || eval $as_mkdir_p || {
+- as_dirs=
+- while :; do
+- case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+- *) as_qdir=$as_dir;;
+- esac
+- as_dirs="'$as_qdir' $as_dirs"
+- as_dir=`$as_dirname -- "$as_dir" ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+- s//\1/
+- q
+- }
+- /^X\(\/\/\)[^/].*/{
+- s//\1/
+- q
+- }
+- /^X\(\/\/\)$/{
+- s//\1/
+- q
+- }
+- /^X\(\/\).*/{
+- s//\1/
+- q
+- }
+- s/.*/./; q'`
+- test -d "$as_dir" && break
+- done
+- test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+-
+-
+-} # as_fn_mkdir_p
+-# as_fn_append VAR VALUE
+-# ----------------------
+-# Append the text in VALUE to the end of the definition contained in VAR. Take
+-# advantage of any shell optimizations that allow amortized linear growth over
+-# repeated appends, instead of the typical quadratic growth present in naive
+-# implementations.
+-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+- eval 'as_fn_append ()
+- {
+- eval $1+=\$2
+- }'
+-else
+- as_fn_append ()
+- {
+- eval $1=\$$1\$2
+- }
+-fi # as_fn_append
+-
+-# as_fn_arith ARG...
+-# ------------------
+-# Perform arithmetic evaluation on the ARGs, and store the result in the
+-# global $as_val. Take advantage of shells that can avoid forks. The arguments
+-# must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+- eval 'as_fn_arith ()
+- {
+- as_val=$(( $* ))
+- }'
+-else
+- as_fn_arith ()
+- {
+- as_val=`expr "$@" || test $? -eq 1`
+- }
+-fi # as_fn_arith
+-
+-
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
+-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
+-as_fn_error ()
+-{
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+- fi
+- $as_echo "$as_me: error: $1" >&2
+- as_fn_exit $as_status
+-} # as_fn_error
++done
+
++# Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+@@ -383,17 +126,13 @@ else
+ as_basename=false
+ fi
+
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+- as_dirname=dirname
+-else
+- as_dirname=false
+-fi
+
++# Name of the executable.
+ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+@@ -408,140 +147,427 @@ $as_echo X/"$0" |
+ }
+ s/.*/./; q'`
+
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++# CDPATH.
++$as_unset CDPATH
+
+
+- as_lineno_1=$LINENO as_lineno_1a=$LINENO
+- as_lineno_2=$LINENO as_lineno_2a=$LINENO
+- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+- sed -n '
+- p
+- /[$]LINENO/=
+- ' <$as_myself |
+- sed '
+- s/[$]LINENO.*/&-/
+- t lineno
+- b
+- :lineno
+- N
+- :loop
+- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+- t loop
+- s/-\n.*//
+- ' >$as_me.lineno &&
+- chmod +x "$as_me.lineno" ||
+- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
++if test "x$CONFIG_SHELL" = x; then
++ if (eval ":") 2>/dev/null; then
++ as_have_required=yes
++else
++ as_have_required=no
++fi
+
+- # Don't try to exec as it changes $[0], causing all sort of problems
+- # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensitive to this).
+- . "./$as_me.lineno"
+- # Exit status is that of the last command.
+- exit
++ if test $as_have_required = yes && (eval ":
++(as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
+ }
+
+-ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in #(((((
+--n*)
+- case `echo 'xy\c'` in
+- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+- xy) ECHO_C='\c';;
+- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+- ECHO_T=' ';;
+- esac;;
+-*)
+- ECHO_N='-n';;
+-esac
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-if test -d conf$$.dir; then
+- rm -f conf$$.dir/conf$$.file
++exitcode=0
++if as_func_success; then
++ :
+ else
+- rm -f conf$$.dir
+- mkdir conf$$.dir 2>/dev/null
++ exitcode=1
++ echo as_func_success failed.
+ fi
+-if (echo >conf$$.file) 2>/dev/null; then
+- if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
+- elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+- else
+- as_ln_s='cp -p'
+- fi
+-else
+- as_ln_s='cp -p'
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
+ fi
+-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+-rmdir conf$$.dir 2>/dev/null
+
+-if mkdir -p . 2>/dev/null; then
+- as_mkdir_p='mkdir -p "$as_dir"'
++if as_func_ret_success; then
++ :
+ else
+- test -d ./-p && rmdir ./-p
+- as_mkdir_p=false
++ exitcode=1
++ echo as_func_ret_success failed.
+ fi
+
+-if test -x / >/dev/null 2>&1; then
+- as_test_x='test -x'
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
+ else
+- if ls -dL / >/dev/null 2>&1; then
+- as_ls_L_option=L
+- else
+- as_ls_L_option=
+- fi
+- as_test_x='
+- eval sh -c '\''
+- if test -d "$1"; then
+- test -d "$1/.";
+- else
+- case $1 in #(
+- -*)set "./$1";;
+- esac;
+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+- ???[sx]*):;;*)false;;esac;fi
+- '\'' sh
+- '
++ exitcode=1
++ echo positional parameters were not saved.
+ fi
+-as_executable_p=$as_test_x
+
+-# 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'"
++test \$exitcode = 0) || { (exit 1); exit 1; }
+
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++(
++ as_lineno_1=\$LINENO
++ as_lineno_2=\$LINENO
++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++ :
++else
++ as_candidate_shells=
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ case $as_dir in
++ /*)
++ for as_base in sh bash ksh sh5; do
++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++ done;;
++ esac
++done
++IFS=$as_save_IFS
+
+
+-exec 7<&0 </dev/null 6>&1
++ for as_shell in $as_candidate_shells $SHELL; do
++ # Try only shells that exist, to save several forks.
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++ { ("$as_shell") 2> /dev/null <<\_ASEOF
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
+
+-# Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# so uname gets run too.
+-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++fi
+
+-#
+-# Initializations.
+-#
+-ac_default_prefix=/usr/local
+-ac_clean_files=
+-ac_config_libobj_dir=.
+-LIBOBJS=
+-cross_compiling=no
+-subdirs=
+-MFLAGS=
++
++:
++_ASEOF
++}; then
++ CONFIG_SHELL=$as_shell
++ as_have_required=yes
++ if { "$as_shell" 2> /dev/null <<\_ASEOF
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
++fi
++
++
++:
++(as_func_return () {
++ (exit $1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
++ as_lineno_1=$LINENO
++ as_lineno_2=$LINENO
++ test "x$as_lineno_1" != "x$as_lineno_2" &&
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++ break
++fi
++
++fi
++
++ done
++
++ if test "x$CONFIG_SHELL" != x; then
++ for as_var in BASH_ENV ENV
++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ done
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++ if test $as_have_required = no; then
++ echo This script requires a shell more modern than all the
++ echo shells that I found on your system. Please install a
++ echo modern shell, or manually run the script under such a
++ echo shell if you do have one.
++ { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++ echo No shell found that supports shell functions.
++ echo Please tell autoconf at gnu.org about your system,
++ echo including any error possibly output before this
++ echo message
++}
++
++
++
++ as_lineno_1=$LINENO
++ as_lineno_2=$LINENO
++ test "x$as_lineno_1" != "x$as_lineno_2" &&
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
++
++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++ # uniformly replaced by the line number. The first 'sed' inserts a
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
++ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
++ N
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
++ t loop
++ s/-\n.*//
++ ' >$as_me.lineno &&
++ chmod +x "$as_me.lineno" ||
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++ { (exit 1); exit 1; }; }
++
++ # Don't try to exec as it changes $[0], causing all sort of problems
++ # (the dirname of $[0] is not the place where we might find the
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
++ # Exit status is that of the last command.
++ exit
++}
++
++
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++ case `echo 'x\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ *) ECHO_C='\c';;
++ esac;;
++*)
++ ECHO_N='-n';;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
++ as_expr=expr
++else
++ as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
++else
++ rm -f conf$$.dir
++ mkdir conf$$.dir
++fi
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++ as_ln_s='cp -p'
++elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
++else
++ as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
++
++if mkdir -p . 2>/dev/null; then
++ as_mkdir_p=:
++else
++ test -d ./-p && rmdir ./-p
++ as_mkdir_p=false
++fi
++
++if test -x / >/dev/null 2>&1; then
++ as_test_x='test -x'
++else
++ if ls -dL / >/dev/null 2>&1; then
++ as_ls_L_option=L
++ else
++ as_ls_L_option=
++ fi
++ as_test_x='
++ eval sh -c '\''
++ if test -d "$1"; then
++ test -d "$1/.";
++ else
++ case $1 in
++ -*)set "./$1";;
++ esac;
++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++ ???[sx]*):;;*)false;;esac;fi
++ '\'' sh
++ '
++fi
++as_executable_p=$as_test_x
++
++# 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'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++
++exec 7<&0 </dev/null 6>&1
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_clean_files=
++ac_config_libobj_dir=.
++LIBOBJS=
++cross_compiling=no
++subdirs=
++MFLAGS=
+ MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
+
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -549,7 +575,6 @@ PACKAGE_TARNAME=
+ PACKAGE_VERSION=
+ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
+-PACKAGE_URL=
+
+ ac_unique_file="version.h"
+ # Factoring default headers for most tests.
+@@ -588,2934 +613,6698 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='LTLIBOBJS
+-LIBOBJS
+-BUILD_LDFLAGS
+-BUILD_CFLAGS
+-INTL_FLAGS
+-DO_TEST_SUITE
+-ET_DIR
+-SS_DIR
+-LDFLAG_STATIC
+-root_sysconfdir
+-root_libdir
+-root_sbindir
+-root_bindir
+-root_prefix
+-UNIX_CMT
+-CYGWIN_CMT
+-LINUX_CMT
+-UNI_DIFF_OPTS
+-SEM_INIT_LIB
+-SOCKET_LIB
+-SIZEOF_LONG_LONG
+-SIZEOF_LONG
+-SIZEOF_INT
+-SIZEOF_SHORT
+-BUILD_CC
+-MAKEINFO
+-STRIP
+-AR
+-LDCONFIG
+-PERL
+-SED
+-AWK
+-CHMOD
+-RM
+-CP
+-MV
+-LN_S
+-LN
+-ifNotGNUmake
+-ifGNUmake
+-BINARY_TYPE
+-POSUB
+-LTLIBINTL
+-LIBINTL
+-INTLLIBS
+-INTL_LIBTOOL_SUFFIX_PREFIX
+-INTLOBJS
+-GENCAT
+-INSTOBJEXT
+-DATADIRNAME
+-CATOBJEXT
+-USE_INCLUDED_LIBINTL
+-BUILD_INCLUDED_LIBINTL
+-INTLBISON
+-LTLIBICONV
+-LIBICONV
+-HAVE_WPRINTF
+-HAVE_SNPRINTF
+-HAVE_ASPRINTF
+-HAVE_POSIX_PRINTF
+-GLIBC21
+-ALLOCA
+-RANLIB
+-MSGMERGE
+-XGETTEXT
+-GMSGFMT
+-MSGFMT
+-USE_NLS
+-MKINSTALLDIRS
+-INSTALL_DATA
+-INSTALL_SCRIPT
+-INSTALL_PROGRAM
+-SET_MAKE
+-VERSION
+-PACKAGE
+-GETTEXT_PACKAGE
+-UUIDD_CMT
+-E2INITRD_MAN
+-E2INITRD_PROG
+-FSCK_MAN
+-FSCK_PROG
+-RESIZER_CMT
+-IMAGER_CMT
+-DEBUGFS_CMT
+-BLKID_CMT
+-DEPPROFILED_LIBBLKID
+-PROFILED_LIBBLKID
+-DEPSTATIC_LIBBLKID
+-STATIC_LIBBLKID
+-DEPLIBBLKID
+-LIBBLKID
+-UUID_CMT
+-DEPPROFILED_LIBUUID
+-PROFILED_LIBUUID
+-DEPSTATIC_LIBUUID
+-STATIC_LIBUUID
+-DEPLIBUUID
+-LIBUUID
+-PKG_CONFIG
+-TEST_IO_CMT
+-PRIVATE_LIBS_CMT
+-LDFLAG_DYNAMIC
+-PROFILED_LIB_EXT
+-STATIC_LIB_EXT
+-LIB_EXT
+-CHECKER_CMT
+-PROFILE_CMT
+-BSDLIB_CMT
+-ELF_CMT
+-HTREE_CMT
+-Q
+-E
+-MAINTAINER_CMT
+-LINUX_INCLUDE
+-EGREP
+-GREP
+-CPP
+-DLOPEN_LIB
+-OBJEXT
+-EXEEXT
+-ac_ct_CC
+-CPPFLAGS
+-LDFLAGS
+-CFLAGS
+-CC
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+-E2FSPROGS_PKGVER
+-E2FSPROGS_VERSION
+-E2FSPROGS_DAY
+-E2FSPROGS_MONTH
+-E2FSPROGS_YEAR
+-target_alias
+-host_alias
+-build_alias
+-LIBS
+-ECHO_T
+-ECHO_N
+-ECHO_C
+-DEFS
+-mandir
+-localedir
+-libdir
+-psdir
+-pdfdir
+-dvidir
+-htmldir
+-infodir
+-docdir
+-oldincludedir
+-includedir
+-localstatedir
+-sharedstatedir
+-sysconfdir
+-datadir
+-datarootdir
+-libexecdir
+-sbindir
+-bindir
+-program_transform_name
+-prefix
+-exec_prefix
+-PACKAGE_URL
+-PACKAGE_BUGREPORT
+-PACKAGE_STRING
+-PACKAGE_VERSION
+-PACKAGE_TARNAME
+-PACKAGE_NAME
++ac_subst_vars='SHELL
+ PATH_SEPARATOR
+-SHELL'
+-ac_subst_files='MCONFIG
+-MAKEFILE_ELF
+-MAKEFILE_BSDLIB
+-MAKEFILE_PROFILE
+-MAKEFILE_CHECKER
+-MAKEFILE_LIBRARY
+-ASM_TYPES_HEADER
+-PUBLIC_CONFIG_HEADER'
+-ac_user_opts='
+-enable_option_checking
+-with_diet_libc
+-with_cc
+-with_ccopts
+-with_ldopts
+-with_root_prefix
+-enable_maintainer_mode
+-enable_verbose_makecmds
+-enable_compression
+-enable_htree
+-enable_elf_shlibs
+-enable_bsd_shlibs
+-enable_profile
+-enable_checker
+-enable_jbd_debug
+-enable_blkid_debug
+-enable_testio_debug
+-enable_libuuid
+-enable_libblkid
+-enable_debugfs
+-enable_imager
+-enable_resizer
+-enable_fsck
+-enable_e2initrd_helper
+-enable_tls
+-enable_uuidd
+-enable_nls
+-with_gnu_ld
+-enable_rpath
+-with_libiconv_prefix
+-with_included_gettext
+-with_libintl_prefix
+-'
+- ac_precious_vars='build_alias
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
+ host_alias
+ target_alias
++E2FSPROGS_YEAR
++E2FSPROGS_MONTH
++E2FSPROGS_DAY
++E2FSPROGS_VERSION
++E2FSPROGS_PKGVER
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
+ CC
+ CFLAGS
+ LDFLAGS
+-LIBS
+ CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DLOPEN_LIB
+ CPP
+-PKG_CONFIG'
++GREP
++EGREP
++LINUX_INCLUDE
++MAINTAINER_CMT
++E
++Q
+LFSCK_CMT
+LFSCK_MAN
+LUSTRE
- HTREE_CMT
- ELF_CMT
- BSDLIB_CMT
-@@ -759,6 +762,7 @@ SIZEOF_LONG
- SIZEOF_LONG_LONG
- SOCKET_LIB
- DLOPEN_LIB
++HTREE_CMT
++ELF_CMT
++BSDLIB_CMT
++PROFILE_CMT
++CHECKER_CMT
++LIB_EXT
++STATIC_LIB_EXT
++PROFILED_LIB_EXT
++LDFLAG_DYNAMIC
++PRIVATE_LIBS_CMT
++TEST_IO_CMT
++PKG_CONFIG
++LIBUUID
++DEPLIBUUID
++STATIC_LIBUUID
++DEPSTATIC_LIBUUID
++PROFILED_LIBUUID
++DEPPROFILED_LIBUUID
++UUID_CMT
++LIBBLKID
++DEPLIBBLKID
++STATIC_LIBBLKID
++DEPSTATIC_LIBBLKID
++PROFILED_LIBBLKID
++DEPPROFILED_LIBBLKID
++BLKID_CMT
++DEBUGFS_CMT
++IMAGER_CMT
++RESIZER_CMT
++FSCK_PROG
++FSCK_MAN
++E2INITRD_PROG
++E2INITRD_MAN
++UUIDD_CMT
++GETTEXT_PACKAGE
++PACKAGE
++VERSION
++SET_MAKE
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++MKINSTALLDIRS
++USE_NLS
++MSGFMT
++GMSGFMT
++XGETTEXT
++MSGMERGE
++RANLIB
++ALLOCA
++GLIBC21
++HAVE_POSIX_PRINTF
++HAVE_ASPRINTF
++HAVE_SNPRINTF
++HAVE_WPRINTF
++LIBICONV
++LTLIBICONV
++INTLBISON
++BUILD_INCLUDED_LIBINTL
++USE_INCLUDED_LIBINTL
++CATOBJEXT
++DATADIRNAME
++INSTOBJEXT
++GENCAT
++INTLOBJS
++INTL_LIBTOOL_SUFFIX_PREFIX
++INTLLIBS
++LIBINTL
++LTLIBINTL
++POSUB
++BINARY_TYPE
++ifGNUmake
++ifNotGNUmake
++LN
++LN_S
++MV
++CP
++RM
++CHMOD
++AWK
++SED
++PERL
++LDCONFIG
++AR
++STRIP
++MAKEINFO
++BUILD_CC
++SIZEOF_SHORT
++SIZEOF_INT
++SIZEOF_LONG
++SIZEOF_LONG_LONG
++SOCKET_LIB
+DB_LIB
- SEM_INIT_LIB
- UNI_DIFF_OPTS
- LINUX_CMT
-@@ -1369,6 +1373,7 @@ Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable makefile rules useful for maintainers
++SEM_INIT_LIB
++UNI_DIFF_OPTS
++LINUX_CMT
++CYGWIN_CMT
++UNIX_CMT
++root_prefix
++root_bindir
++root_sbindir
++root_libdir
++root_sysconfdir
++LDFLAG_STATIC
++SS_DIR
++ET_DIR
++DO_TEST_SUITE
++INTL_FLAGS
++BUILD_CFLAGS
++BUILD_LDFLAGS
++LIBOBJS
++LTLIBOBJS'
++ac_subst_files='MCONFIG
++MAKEFILE_ELF
++MAKEFILE_BSDLIB
++MAKEFILE_PROFILE
++MAKEFILE_CHECKER
++MAKEFILE_LIBRARY
++ASM_TYPES_HEADER
++PUBLIC_CONFIG_HEADER'
++ ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++LIBS
++CPPFLAGS
++CPP
++PKG_CONFIG'
++
++
++# Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++cache_file=/dev/null
++exec_prefix=NONE
++no_create=
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++verbose=
++x_includes=NONE
++x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# 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.
++# (The list follows the same order as the GNU Coding Standards.)
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
++
++ac_prev=
++ac_dashdash=
++for ac_option
++do
++ # If the previous option needs an argument, assign it.
++ if test -n "$ac_prev"; then
++ eval $ac_prev=\$ac_option
++ ac_prev=
++ continue
++ fi
++
++ case $ac_option in
++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *) ac_optarg=yes ;;
++ esac
++
++ # Accept the important Cygnus configure options, so we can diagnose typos.
++
++ case $ac_dashdash$ac_option in
++ --)
++ ac_dashdash=yes ;;
++
++ -bindir | --bindir | --bindi | --bind | --bin | --bi)
++ ac_prev=bindir ;;
++ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++ bindir=$ac_optarg ;;
++
++ -build | --build | --buil | --bui | --bu)
++ ac_prev=build_alias ;;
++ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++ build_alias=$ac_optarg ;;
++
++ -cache-file | --cache-file | --cache-fil | --cache-fi \
++ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++ ac_prev=cache_file ;;
++ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++ cache_file=$ac_optarg ;;
++
++ --config-cache | -C)
++ cache_file=config.cache ;;
++
++ -datadir | --datadir | --datadi | --datad)
++ ac_prev=datadir ;;
++ -datadir=* | --datadir=* | --datadi=* | --datad=*)
++ datadir=$ac_optarg ;;
++
++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++ | --dataroo | --dataro | --datar)
++ ac_prev=datarootdir ;;
++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++ datarootdir=$ac_optarg ;;
++
++ -disable-* | --disable-*)
++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++ # Reject names that are not valid shell variable names.
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++ { (exit 1); exit 1; }; }
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++ eval enable_$ac_feature=no ;;
++
++ -docdir | --docdir | --docdi | --doc | --do)
++ ac_prev=docdir ;;
++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++ docdir=$ac_optarg ;;
++
++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++ ac_prev=dvidir ;;
++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++ dvidir=$ac_optarg ;;
++
++ -enable-* | --enable-*)
++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++ # Reject names that are not valid shell variable names.
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++ { (exit 1); exit 1; }; }
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++ eval enable_$ac_feature=\$ac_optarg ;;
++
++ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++ | --exec | --exe | --ex)
++ ac_prev=exec_prefix ;;
++ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++ | --exec=* | --exe=* | --ex=*)
++ exec_prefix=$ac_optarg ;;
++
++ -gas | --gas | --ga | --g)
++ # Obsolete; use --with-gas.
++ with_gas=yes ;;
++
++ -help | --help | --hel | --he | -h)
++ ac_init_help=long ;;
++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++ ac_init_help=recursive ;;
++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++ ac_init_help=short ;;
++
++ -host | --host | --hos | --ho)
++ ac_prev=host_alias ;;
++ -host=* | --host=* | --hos=* | --ho=*)
++ host_alias=$ac_optarg ;;
++
++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++ ac_prev=htmldir ;;
++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++ | --ht=*)
++ htmldir=$ac_optarg ;;
++
++ -includedir | --includedir | --includedi | --included | --include \
++ | --includ | --inclu | --incl | --inc)
++ ac_prev=includedir ;;
++ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++ | --includ=* | --inclu=* | --incl=* | --inc=*)
++ includedir=$ac_optarg ;;
++
++ -infodir | --infodir | --infodi | --infod | --info | --inf)
++ ac_prev=infodir ;;
++ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++ infodir=$ac_optarg ;;
++
++ -libdir | --libdir | --libdi | --libd)
++ ac_prev=libdir ;;
++ -libdir=* | --libdir=* | --libdi=* | --libd=*)
++ libdir=$ac_optarg ;;
++
++ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++ | --libexe | --libex | --libe)
++ ac_prev=libexecdir ;;
++ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++ | --libexe=* | --libex=* | --libe=*)
++ libexecdir=$ac_optarg ;;
++
++ -localedir | --localedir | --localedi | --localed | --locale)
++ ac_prev=localedir ;;
++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++ localedir=$ac_optarg ;;
++
++ -localstatedir | --localstatedir | --localstatedi | --localstated \
++ | --localstate | --localstat | --localsta | --localst | --locals)
++ ac_prev=localstatedir ;;
++ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
++ localstatedir=$ac_optarg ;;
++
++ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++ ac_prev=mandir ;;
++ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++ mandir=$ac_optarg ;;
++
++ -nfp | --nfp | --nf)
++ # Obsolete; use --without-fp.
++ with_fp=no ;;
++
++ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++ | --no-cr | --no-c | -n)
++ no_create=yes ;;
++
++ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++ no_recursion=yes ;;
++
++ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++ | --oldin | --oldi | --old | --ol | --o)
++ ac_prev=oldincludedir ;;
++ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++ oldincludedir=$ac_optarg ;;
++
++ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++ ac_prev=prefix ;;
++ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++ prefix=$ac_optarg ;;
++
++ -program-prefix | --program-prefix | --program-prefi | --program-pref \
++ | --program-pre | --program-pr | --program-p)
++ ac_prev=program_prefix ;;
++ -program-prefix=* | --program-prefix=* | --program-prefi=* \
++ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++ program_prefix=$ac_optarg ;;
++
++ -program-suffix | --program-suffix | --program-suffi | --program-suff \
++ | --program-suf | --program-su | --program-s)
++ ac_prev=program_suffix ;;
++ -program-suffix=* | --program-suffix=* | --program-suffi=* \
++ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++ program_suffix=$ac_optarg ;;
++
++ -program-transform-name | --program-transform-name \
++ | --program-transform-nam | --program-transform-na \
++ | --program-transform-n | --program-transform- \
++ | --program-transform | --program-transfor \
++ | --program-transfo | --program-transf \
++ | --program-trans | --program-tran \
++ | --progr-tra | --program-tr | --program-t)
++ ac_prev=program_transform_name ;;
++ -program-transform-name=* | --program-transform-name=* \
++ | --program-transform-nam=* | --program-transform-na=* \
++ | --program-transform-n=* | --program-transform-=* \
++ | --program-transform=* | --program-transfor=* \
++ | --program-transfo=* | --program-transf=* \
++ | --program-trans=* | --program-tran=* \
++ | --progr-tra=* | --program-tr=* | --program-t=*)
++ program_transform_name=$ac_optarg ;;
++
++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++ ac_prev=pdfdir ;;
++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++ pdfdir=$ac_optarg ;;
++
++ -psdir | --psdir | --psdi | --psd | --ps)
++ ac_prev=psdir ;;
++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++ psdir=$ac_optarg ;;
++
++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++ | -silent | --silent | --silen | --sile | --sil)
++ silent=yes ;;
++
++ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++ ac_prev=sbindir ;;
++ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++ | --sbi=* | --sb=*)
++ sbindir=$ac_optarg ;;
++
++ -sharedstatedir | --sharedstatedir | --sharedstatedi \
++ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++ | --sharedst | --shareds | --shared | --share | --shar \
++ | --sha | --sh)
++ ac_prev=sharedstatedir ;;
++ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++ | --sha=* | --sh=*)
++ sharedstatedir=$ac_optarg ;;
++
++ -site | --site | --sit)
++ ac_prev=site ;;
++ -site=* | --site=* | --sit=*)
++ site=$ac_optarg ;;
++
++ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++ ac_prev=srcdir ;;
++ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++ srcdir=$ac_optarg ;;
++
++ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++ | --syscon | --sysco | --sysc | --sys | --sy)
++ ac_prev=sysconfdir ;;
++ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++ sysconfdir=$ac_optarg ;;
++
++ -target | --target | --targe | --targ | --tar | --ta | --t)
++ ac_prev=target_alias ;;
++ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++ target_alias=$ac_optarg ;;
++
++ -v | -verbose | --verbose | --verbos | --verbo | --verb)
++ verbose=yes ;;
++
++ -version | --version | --versio | --versi | --vers | -V)
++ ac_init_version=: ;;
++
++ -with-* | --with-*)
++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++ # Reject names that are not valid shell variable names.
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid package name: $ac_package" >&2
++ { (exit 1); exit 1; }; }
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++ eval with_$ac_package=\$ac_optarg ;;
++
++ -without-* | --without-*)
++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++ # Reject names that are not valid shell variable names.
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid package name: $ac_package" >&2
++ { (exit 1); exit 1; }; }
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++ eval with_$ac_package=no ;;
++
++ --x)
++ # Obsolete; use --with-x.
++ with_x=yes ;;
++
++ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++ | --x-incl | --x-inc | --x-in | --x-i)
++ ac_prev=x_includes ;;
++ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++ x_includes=$ac_optarg ;;
++
++ -x-libraries | --x-libraries | --x-librarie | --x-librari \
++ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++ ac_prev=x_libraries ;;
++ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++ x_libraries=$ac_optarg ;;
++
++ -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++ { (exit 1); exit 1; }; }
++ ;;
++
++ *=*)
++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
++ # Reject names that are not valid shell variable names.
++ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++ { (exit 1); exit 1; }; }
++ eval $ac_envvar=\$ac_optarg
++ export $ac_envvar ;;
++
++ *)
++ # FIXME: should be removed in autoconf 3.0.
++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++ ;;
++
++ esac
++done
++
++if test -n "$ac_prev"; then
++ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++ { echo "$as_me: error: missing argument to $ac_option" >&2
++ { (exit 1); exit 1; }; }
++fi
++
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
++do
++ eval ac_val=\$$ac_var
++ case $ac_val in
++ [\\/$]* | ?:[\\/]* ) continue;;
++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
++ esac
++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++ { (exit 1); exit 1; }; }
++done
++
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++ if test "x$build_alias" = x; then
++ cross_compiling=maybe
++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used." >&2
++ elif test "x$build_alias" != "x$host_alias"; then
++ cross_compiling=yes
++ fi
++fi
++
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
++
++
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++ { echo "$as_me: error: Working directory cannot be determined" >&2
++ { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++ { echo "$as_me: error: pwd does not report name of working directory" >&2
++ { (exit 1); exit 1; }; }
++
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++ ac_srcdir_defaulted=yes
++ # Try the directory containing this script, then the parent directory.
++ ac_confdir=`$as_dirname -- "$0" ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ 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'`
++ srcdir=$ac_confdir
++ if test ! -r "$srcdir/$ac_unique_file"; then
++ srcdir=..
++ fi
++else
++ ac_srcdir_defaulted=no
++fi
++if test ! -r "$srcdir/$ac_unique_file"; then
++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++ { (exit 1); exit 1; }; }
++ 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.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++ eval ac_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_env_${ac_var}_value=\$${ac_var}
++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
++
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++ # Omit some internal or obsolete options to make the list less imposing.
++ # This message is too long to be a string in the A/UX 3.1 sh.
++ cat <<_ACEOF
++\`configure' configures this package to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE. See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++ -h, --help display this help and exit
++ --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
++ -q, --quiet, --silent do not print \`checking...' messages
++ --cache-file=FILE cache test results in FILE [disabled]
++ -C, --config-cache alias for \`--cache-file=config.cache'
++ -n, --no-create do not create output files
++ --srcdir=DIR find the sources in DIR [configure dir or \`..']
++
++Installation directories:
++ --prefix=PREFIX install architecture-independent files in PREFIX
++ [$ac_default_prefix]
++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
++ [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++for instance \`--prefix=\$HOME'.
++
++For better control, use the options below.
++
++Fine tuning of the installation directories:
++ --bindir=DIR user executables [EPREFIX/bin]
++ --sbindir=DIR system admin executables [EPREFIX/sbin]
++ --libexecdir=DIR program executables [EPREFIX/libexec]
++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
++ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --libdir=DIR object code libraries [EPREFIX/lib]
++ --includedir=DIR C header files [PREFIX/include]
++ --oldincludedir=DIR C header files for non-gcc [/usr/include]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
++_ACEOF
++
++ cat <<\_ACEOF
++
++System types:
++ --build=BUILD configure for building on BUILD [guessed]
++ --host=HOST cross-compile to build programs to run on HOST [BUILD]
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++
++ cat <<\_ACEOF
++
++Optional Features:
++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
++ --enable-maintainer-mode enable makefile rules useful for maintainers
++ --enable-verbose-makecmds enable verbose make command output
+ --disable-lfsck disable EXPERIMENTAL Lustre lfsck support
- --enable-compression enable EXPERIMENTAL compression support
- --enable-htree enable EXPERIMENTAL htree directory support
- --enable-elf-shlibs select ELF shared libraries
-@@ -1404,6 +1409,7 @@ Optional Packages:
- --with-included-gettext use the GNU gettext library included here
- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
- --without-libintl-prefix don't search for libintl in includedir and libdir
++ --enable-compression enable EXPERIMENTAL compression support
++ --enable-htree enable EXPERIMENTAL htree directory support
++ --enable-elf-shlibs select ELF shared libraries
++ --enable-bsd-shlibs select BSD shared libraries
++ --enable-profile build profiling libraries
++ --enable-checker build checker libraries
++ --enable-jbd-debug enable journal debugging
++ --enable-blkid-debug enable blkid debugging
++ --disable-testio-debug disable the use of the test I/O manager for debugging
++ --disable-libuuid do not build private uuid library
++ --disable-libblkid do not build private blkid library
++ --disable-debugfs disable support of debugfs program
++ --disable-imager disable support of e2image program
++ --disable-resizer disable support of e2resize program
++ --enable-fsck build fsck wrapper program
++ --enable-e2initrd-helper build e2initrd-helper program
++ --disable-tls disable use of thread local support
++ --disable-uuidd disable building the uuid daemon
++ --disable-nls do not use Native Language Support
++ --disable-rpath do not hardcode runtime library paths
++
++Optional Packages:
++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
++ --with-diet-libc use diet libc
++ --with-cc no longer supported, use CC= instead
++ --with-ccopts no longer supported, use CFLAGS= instead
++ --with-ldopts no longer supported, use LDFLAGS= instead
++ --with-root-prefix=PREFIX override prefix variable for files to be placed in the root
+ --with-lustre=LUSTRE specify the path to Lustre sources for lfsck
++ --with-gnu-ld assume the C compiler uses GNU ld default=no
++ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
++ --without-libiconv-prefix don't search for libiconv in includedir and libdir
++ --with-included-gettext use the GNU gettext library included here
++ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
++ --without-libintl-prefix don't search for libintl in includedir and libdir
++
++Some influential environment variables:
++ CC C compiler command
++ CFLAGS C compiler flags
++ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
++ nonstandard directory <lib dir>
++ LIBS libraries to pass to the linker, e.g. -l<library>
++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ you have headers in a nonstandard directory <include dir>
++ CPP C preprocessor
++ PKG_CONFIG path to pkg-config utility
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++_ACEOF
++ac_status=$?
++fi
++
++if test "$ac_init_help" = "recursive"; then
++ # If there are subdirs, report their specific --help.
++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++ test -d "$ac_dir" || continue
++ ac_builddir=.
++
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
++
++case $srcdir in
++ .) # We are building in place.
++ ac_srcdir=.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
++ ac_srcdir=$srcdir$ac_dir_suffix;
++ 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
++
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
++ else
++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
++ done
++fi
++
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++ cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.61
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++ exit
++fi
++cat >config.log <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by $as_me, which was
++generated by GNU Autoconf 2.61. Invocation command line was
++
++ $ $0 $@
++
++_ACEOF
++exec 5>>config.log
++{
++cat <<_ASUNAME
++## --------- ##
++## 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`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
++
++/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`
++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
++/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`
++
++_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
++IFS=$as_save_IFS
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++## ----------- ##
++## Core tests. ##
++## ----------- ##
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++ for ac_arg
++ do
++ case $ac_arg in
++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++ | -silent | --silent | --silen | --sile | --sil)
++ continue ;;
++ *\'*)
++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ esac
++ case $ac_pass in
++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++ 2)
++ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++ if test $ac_must_keep_next = true; then
++ ac_must_keep_next=false # Got value, back to normal.
++ else
++ 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_arg'"
++ ;;
++ esac
++ done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log. We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
++trap 'exit_status=$?
++ # Save into config.log some information that might help in debugging.
++ {
++ echo
++
++ cat <<\_ASBOX
++## ---------------- ##
++## Cache variables. ##
++## ---------------- ##
++_ASBOX
++ echo
++ # The following way of writing the cache mishandles newlines in values,
++(
++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ *) $as_unset $ac_var ;;
++ esac ;;
++ esac
++ done
++ (set) 2>&1 |
++ 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"
++ ;; #(
++ *)
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
++ ;;
++ esac |
++ sort
++)
++ echo
++
++ cat <<\_ASBOX
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++_ASBOX
++ echo
++ for ac_var in $ac_subst_vars
++ do
++ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
++ echo "$ac_var='\''$ac_val'\''"
++ done | sort
++ echo
++
++ if test -n "$ac_subst_files"; then
++ cat <<\_ASBOX
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
++_ASBOX
++ echo
++ for ac_var in $ac_subst_files
++ do
++ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
++ echo "$ac_var='\''$ac_val'\''"
++ done | sort
++ echo
++ fi
++
++ if test -s confdefs.h; then
++ cat <<\_ASBOX
++## ----------- ##
++## confdefs.h. ##
++## ----------- ##
++_ASBOX
++ echo
++ cat confdefs.h
++ echo
++ fi
++ test "$ac_signal" != 0 &&
++ echo "$as_me: caught signal $ac_signal"
++ echo "$as_me: exit $exit_status"
++ } >&5
++ rm -f core *.core core.conftest.* &&
++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
++ exit $exit_status
++' 0
++for ac_signal in 1 2 13 15; do
++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -f -r conftest* confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
++# Prefer explicitly selected file to automatically selected ones.
++if test -n "$CONFIG_SITE"; then
++ set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++ set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++ set x "$ac_default_prefix/share/config.site" \
++ "$ac_default_prefix/etc/config.site"
++fi
++shift
++for ac_site_file
++do
++ if test -r "$ac_site_file"; then
++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
++ sed 's/^/| /' "$ac_site_file" >&5
++ . "$ac_site_file"
++ fi
++done
++
++if test -r "$cache_file"; then
++ # Some versions of bash will fail to source /dev/null (special
++ # files actually), so we avoid doing that.
++ if test -f "$cache_file"; then
++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
++ case $cache_file in
++ [\\/]* | ?:[\\/]* ) . "$cache_file";;
++ *) . "./$cache_file";;
++ esac
++ fi
++else
++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
++ >$cache_file
++fi
++
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++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
++ eval ac_old_val=\$ac_cv_env_${ac_var}_value
++ eval ac_new_val=\$ac_env_${ac_var}_value
++ case $ac_old_set,$ac_new_set in
++ set,)
++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++ ac_cache_corrupted=: ;;
++ ,set)
++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++ ac_cache_corrupted=: ;;
++ ,);;
++ *)
++ 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: error: \`$ac_var' has changed since the previous run:" >&2;}
++ { 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: current value: $ac_new_val" >&2;}
++ ac_cache_corrupted=:
++ fi;;
++ esac
++ # 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=$ac_new_val ;;
++ esac
++ case " $ac_configure_args " in
++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++ esac
++ fi
++done
++if $ac_cache_corrupted; then
++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ac_ext=c
++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
++
++
++
++ac_aux_dir=
++for ac_dir in config "$srcdir"/config; do
++ if test -f "$ac_dir/install-sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install-sh -c"
++ break
++ elif test -f "$ac_dir/install.sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install.sh -c"
++ break
++ elif test -f "$ac_dir/shtool"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/shtool install -c"
++ break
++ fi
++done
++if test -z "$ac_aux_dir"; then
++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++# 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
++# whose full name contains unusual characters.
++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.
++
++
++MCONFIG=./MCONFIG
++
++BINARY_TYPE=bin
++E2FSPROGS_VERSION=`grep E2FSPROGS_VERSION ${srcdir}/version.h \
++ | awk '{print $3}' | tr \" " " | awk '{print $1}'`
++DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
++ | tr \" " "`
++E2FSPROGS_DAY=`echo $DATE | awk -F- '{print $1}'`
++MONTH=`echo $DATE | awk -F- '{print $2}'`
++YEAR=`echo $DATE | awk -F- '{print $3}'`
++
++if expr $YEAR ">" 1900 > /dev/null ; then
++ E2FSPROGS_YEAR=$YEAR
++elif expr $YEAR ">" 90 >/dev/null ; then
++ E2FSPROGS_YEAR=19$YEAR
++else
++ E2FSPROGS_YEAR=20$YEAR
++fi
++
++case $MONTH in
++Jan) MONTH_NUM=01; E2FSPROGS_MONTH="January" ;;
++Feb) MONTH_NUM=02; E2FSPROGS_MONTH="February" ;;
++Mar) MONTH_NUM=03; E2FSPROGS_MONTH="March" ;;
++Apr) MONTH_NUM=04; E2FSPROGS_MONTH="April" ;;
++May) MONTH_NUM=05; E2FSPROGS_MONTH="May" ;;
++Jun) MONTH_NUM=06; E2FSPROGS_MONTH="June" ;;
++Jul) MONTH_NUM=07; E2FSPROGS_MONTH="July" ;;
++Aug) MONTH_NUM=08; E2FSPROGS_MONTH="August" ;;
++Sep) MONTH_NUM=09; E2FSPROGS_MONTH="September" ;;
++Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
++Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
++Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
++*) { echo "$as_me:$LINENO: WARNING: Unknown month $MONTH??" >&5
++echo "$as_me: WARNING: Unknown month $MONTH??" >&2;} ;;
++esac
++
++base_ver=`echo $E2FSPROGS_VERSION | \
++ sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS//'`
++
++date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
++
++case $E2FSPROGS_VERSION in
++*-WIP|pre-*)
++ E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
++ ;;
++*)
++ E2FSPROGS_PKGVER="$base_ver"
++ ;;
++esac
++
++unset DATE MONTH YEAR base_ver pre_vers date_spec
++{ echo "$as_me:$LINENO: result: Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&5
++echo "${ECHO_T}Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&6; }
++{ echo "$as_me:$LINENO: result: Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&5
++echo "${ECHO_T}Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&6; }
++
++
++
++
++
++# Make sure we can run config.sub.
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
++ { (exit 1); exit 1; }; }
++
++{ 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
++else
++ ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++ { (exit 1); exit 1; }; }
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_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; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
++build=$ac_cv_build
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
++
++
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
++if test "${ac_cv_host+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "x$host_alias" = x; then
++ ac_cv_host=$ac_cv_build
++else
++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
++host=$ac_cv_host
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
++
++
++DLOPEN_LIB=''
++ac_ext=c
++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
++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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CC="${ac_tool_prefix}gcc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++ ac_ct_CC=$CC
++ # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_CC="gcc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
++else
++ CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CC="${ac_tool_prefix}cc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ fi
++fi
++if test -z "$CC"; then
++ # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
++ fi
++ ac_cv_prog_CC="cc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# != 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++ fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in cl.exe
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$CC" && break
++ done
++fi
++if test -z "$CC"; then
++ ac_ct_CC=$CC
++ for ac_prog in cl.exe
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_CC="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$ac_ct_CC" && break
++done
++
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort. b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
++ac_rmfiles=
++for ac_file in $ac_files
++do
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++ esac
++done
++rm -f $ac_rmfiles
++
++if { (ac_try="$ac_link_default"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link_default") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile. We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files ''
++do
++ test -f "$ac_file" || continue
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
++ ;;
++ [ab].out )
++ # We found the default executable, but exeext='' is most
++ # certainly right.
++ break;;
++ *.* )
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ fi
++ # We set ac_cv_exeext here because the later test for it is not
++ # safe: cross compilers may not add the suffix if given an `-o'
++ # 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;;
++ esac
++done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
++else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++ if { ac_try='./$ac_file'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { 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.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++fi
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ # 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
++# `rm'.
++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 | *.map | *.inf | *.o | *.obj ) ;;
++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ break;;
++ * ) break;;
++ esac
++done
++else
++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest$ac_cv_exeext
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
++
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
++if test "${ac_cv_objext+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ for ac_file in conftest.o conftest.obj conftest.*; do
++ test -f "$ac_file" || continue;
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++ break;;
++ esac
++done
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_compiler_gnu=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_compiler_gnu=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++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
++else
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++
++/* 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
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++ ;
++ return 0;
++}
++_ACEOF
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_c89=$ac_arg
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
++done
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
++fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
++
++
++ac_ext=c
++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
++
++
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_dl_dlopen=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_dl_dlopen=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
++if test $ac_cv_lib_dl_dlopen = yes; then
++ DLOPEN_LIB=-ldl
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_DLOPEN 1
++_ACEOF
++
++fi
++
++
++WITH_DIET_LIBC=
++
++# Check whether --with-diet-libc was given.
++if test "${with_diet_libc+set}" = set; then
++ withval=$with_diet_libc; CC="diet cc -nostdinc"
++WITH_DIET_LIBC=yes
++{ echo "$as_me:$LINENO: result: CC=$CC" >&5
++echo "${ECHO_T}CC=$CC" >&6; }
++fi
++
++# Check whether --with-cc was given.
++if test "${with_cc+set}" = set; then
++ withval=$with_cc; { { echo "$as_me:$LINENO: error: --with-cc no longer supported; use CC= instead" >&5
++echo "$as_me: error: --with-cc no longer supported; use CC= instead" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++
++# Check whether --with-ccopts was given.
++if test "${with_ccopts+set}" = set; then
++ withval=$with_ccopts; { { echo "$as_me:$LINENO: error: --with-ccopts no longer supported; use CFLAGS= instead" >&5
++echo "$as_me: error: --with-ccopts no longer supported; use CFLAGS= instead" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++
++# Check whether --with-ldopts was given.
++if test "${with_ldopts+set}" = set; then
++ withval=$with_ldopts; { { echo "$as_me:$LINENO: error: --with-ldopts no longer supported; use LDFLAGS= instead" >&5
++echo "$as_me: error: --with-ldopts no longer supported; use LDFLAGS= instead" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++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
++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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CC="${ac_tool_prefix}gcc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++ ac_ct_CC=$CC
++ # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_CC="gcc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
++else
++ CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CC="${ac_tool_prefix}cc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ fi
++fi
++if test -z "$CC"; then
++ # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
++ fi
++ ac_cv_prog_CC="cc"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# != 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++ fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in cl.exe
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$CC" && break
++ done
++fi
++if test -z "$CC"; then
++ ac_ct_CC=$CC
++ for ac_prog in cl.exe
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_CC="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$ac_ct_CC" && break
++done
++
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_compiler_gnu=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_compiler_gnu=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++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
++else
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++
++/* 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
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++ ;
++ return 0;
++}
++_ACEOF
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_prog_cc_c89=$ac_arg
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
++done
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
++fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
++
++
++ac_ext=c
++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
++
++ac_ext=c
++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
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++ CPP=
++fi
++if test -z "$CPP"; then
++ if test "${ac_cv_prog_CPP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Double quotes because CPP needs to be expanded
++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <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.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ break
++fi
++
++ done
++ ac_cv_prog_CPP=$CPP
++
++fi
++ CPP=$ac_cv_prog_CPP
++else
++ ac_cv_prog_CPP=$CPP
++fi
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <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.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ :
++else
++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++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
++
++
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in grep ggrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
++ # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'GREP' >> "conftest.nl"
++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_GREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_GREP="$ac_path_GREP"
++ ac_path_GREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++ $ac_path_GREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++else
++ ac_cv_path_GREP=$GREP
++fi
++
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++ then ac_cv_path_EGREP="$GREP -E"
++ else
++ # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_path_EGREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++ $ac_path_EGREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++else
++ ac_cv_path_EGREP=$EGREP
++fi
++
++
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_header_stdc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_header_stdc=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "memchr" >/dev/null 2>&1; then
++ :
++else
++ ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "free" >/dev/null 2>&1; then
++ :
++else
++ ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++ if test "$cross_compiling" = yes; then
++ :
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++ (('a' <= (c) && (c) <= 'i') \
++ || ('j' <= (c) && (c) <= 'r') \
++ || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++ int i;
++ for (i = 0; i < 256; i++)
++ if (XOR (islower (i), ISLOWER (i))
++ || toupper (i) != TOUPPER (i))
++ return 2;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ :
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.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
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
- Some influential environment variables:
- CC C compiler command
-@@ -3803,6 +3809,46 @@ echo "${ECHO_T}Disabling maintainer mode
- fi
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ eval "$as_ac_Header=yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+-# Initialize some variables set by options.
+-ac_init_help=
+-ac_init_version=false
+-ac_unrecognized_opts=
+-ac_unrecognized_sep=
+-# The variables have the same names as the options, with
+-# dashes changed to underlines.
+-cache_file=/dev/null
+-exec_prefix=NONE
+-no_create=
+-no_recursion=
+-prefix=NONE
+-program_prefix=NONE
+-program_suffix=NONE
+-program_transform_name=s,x,x,
+-silent=
+-site=
+-srcdir=
+-verbose=
+-x_includes=NONE
+-x_libraries=NONE
++ eval "$as_ac_Header=no"
++fi
+
+-# Installation directory options.
+-# These are left unexpanded so users can "make install exec_prefix=/foo"
+-# 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.
+-# (The list follows the same order as the GNU Coding Standards.)
+-bindir='${exec_prefix}/bin'
+-sbindir='${exec_prefix}/sbin'
+-libexecdir='${exec_prefix}/libexec'
+-datarootdir='${prefix}/share'
+-datadir='${datarootdir}'
+-sysconfdir='${prefix}/etc'
+-sharedstatedir='${prefix}/com'
+-localstatedir='${prefix}/var'
+-includedir='${prefix}/include'
+-oldincludedir='/usr/include'
+-docdir='${datarootdir}/doc/${PACKAGE}'
+-infodir='${datarootdir}/info'
+-htmldir='${docdir}'
+-dvidir='${docdir}'
+-pdfdir='${docdir}'
+-psdir='${docdir}'
+-libdir='${exec_prefix}/lib'
+-localedir='${datarootdir}/locale'
+-mandir='${datarootdir}/man'
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+-ac_prev=
+-ac_dashdash=
+-for ac_option
+-do
+- # If the previous option needs an argument, assign it.
+- if test -n "$ac_prev"; then
+- eval $ac_prev=\$ac_option
+- ac_prev=
+- continue
+- fi
++fi
+
+- case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
+- esac
++done
+
+- # Accept the important Cygnus configure options, so we can diagnose typos.
+
+- case $ac_dashdash$ac_option in
+- --)
+- ac_dashdash=yes ;;
++if test "${ac_cv_header_linux_fs_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for linux/fs.h" >&5
++echo $ECHO_N "checking for linux/fs.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_linux_fs_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_fs_h" >&5
++echo "${ECHO_T}$ac_cv_header_linux_fs_h" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking linux/fs.h usability" >&5
++echo $ECHO_N "checking linux/fs.h usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <linux/fs.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- -bindir | --bindir | --bindi | --bind | --bin | --bi)
+- ac_prev=bindir ;;
+- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+- bindir=$ac_optarg ;;
++ ac_header_compiler=no
++fi
+
+- -build | --build | --buil | --bui | --bu)
+- ac_prev=build_alias ;;
+- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+- build_alias=$ac_optarg ;;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+- -cache-file | --cache-file | --cache-fil | --cache-fi \
+- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+- ac_prev=cache_file ;;
+- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+- cache_file=$ac_optarg ;;
++# Is the header present?
++{ echo "$as_me:$LINENO: checking linux/fs.h presence" >&5
++echo $ECHO_N "checking linux/fs.h presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <linux/fs.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- --config-cache | -C)
+- cache_file=config.cache ;;
++ ac_header_preproc=no
++fi
+
+- -datadir | --datadir | --datadi | --datad)
+- ac_prev=datadir ;;
+- -datadir=* | --datadir=* | --datadi=* | --datad=*)
+- datadir=$ac_optarg ;;
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+- | --dataroo | --dataro | --datar)
+- ac_prev=datarootdir ;;
+- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+- datarootdir=$ac_optarg ;;
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: linux/fs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: linux/fs.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: linux/fs.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: linux/fs.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: linux/fs.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: linux/fs.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: linux/fs.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: linux/fs.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: linux/fs.h: in the future, the compiler will take precedence" >&2;}
++
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for linux/fs.h" >&5
++echo $ECHO_N "checking for linux/fs.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_linux_fs_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_linux_fs_h=$ac_header_preproc
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_fs_h" >&5
++echo "${ECHO_T}$ac_cv_header_linux_fs_h" >&6; }
++
++fi
++if test $ac_cv_header_linux_fs_h = yes; then
++ linux_headers=yes
++else
++ linux_headers=no
++fi
++
++
++if test "$linux_headers" != yes; then
++ LINUX_INCLUDE='-I$(top_builddir)/include'
++fi
++
++{ echo "$as_me:$LINENO: checking for additional special compiler flags" >&5
++echo $ECHO_N "checking for additional special compiler flags... $ECHO_C" >&6; }
++if test "$GCC" = yes
++then
++ case "$host_cpu" in
++ alpha) addcflags="-mieee" ;;
++ esac
++fi
++if test "x$addcflags" != x
++then
++ { echo "$as_me:$LINENO: result: $addcflags" >&5
++echo "${ECHO_T}$addcflags" >&6; }
++ CFLAGS="$addcflags $CFLAGS"
++else
++ { echo "$as_me:$LINENO: result: (none)" >&5
++echo "${ECHO_T}(none)" >&6; }
++fi
++LIB_EXT=.a
++STATIC_LIB_EXT=.a
++PROFILED_LIB_EXT=.a
++
++# Check whether --with-root-prefix was given.
++if test "${with_root_prefix+set}" = set; then
++ withval=$with_root_prefix; root_prefix=$withval
++else
++ root_prefix=NONE
++fi
++# Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++ enableval=$enable_maintainer_mode; if test "$enableval" = "no"
++then
++ MAINTAINER_CMT=#
++ { echo "$as_me:$LINENO: result: Disabling maintainer mode" >&5
++echo "${ECHO_T}Disabling maintainer mode" >&6; }
++else
++ MAINTAINER_CMT=
++ { echo "$as_me:$LINENO: result: Enabling maintainer mode" >&5
++echo "${ECHO_T}Enabling maintainer mode" >&6; }
++fi
++
++else
++ MAINTAINER_CMT=#
++{ echo "$as_me:$LINENO: result: Disabling maintainer mode by default" >&5
++echo "${ECHO_T}Disabling maintainer mode by default" >&6; }
++
++fi
++
++
++# Check whether --enable-verbose-makecmds was given.
++if test "${enable_verbose_makecmds+set}" = set; then
++ enableval=$enable_verbose_makecmds; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling verbose make commands" >&5
++echo "${ECHO_T}Disabling verbose make commands" >&6; }
++ E=@echo
++ Q=@
++else
++ { echo "$as_me:$LINENO: result: Enabling verbose make commands" >&5
++echo "${ECHO_T}Enabling verbose make commands" >&6; }
++ E=@\\#
++ Q=
++fi
++
++else
++ { echo "$as_me:$LINENO: result: Disabling verbose make commands" >&5
++echo "${ECHO_T}Disabling verbose make commands" >&6; }
++E=@echo
++Q=@
++
++fi
++
++
++
+# Check whether --enable-lfsck was given.
+if test "${enable_lfsck+set}" = set; then
+ enableval=$enable_lfsck; if test "$enableval" = "no"
@@ -95,13 +5330,14370 @@ Index: e2fsprogs-1.41.5/configure
+ LUSTRE="/usr/src/lustre"
+fi
+
- # Check whether --enable-compression was given.
- if test "${enable_compression+set}" = set; then
- enableval=$enable_compression; if test "$enableval" = "no"
-@@ -12175,6 +12221,146 @@ fi
++# Check whether --enable-compression was given.
++if test "${enable_compression+set}" = set; then
++ enableval=$enable_compression; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling compression support" >&5
++echo "${ECHO_T}Disabling compression support" >&6; }
++else
++ cat >>confdefs.h <<\_ACEOF
++#define ENABLE_COMPRESSION 1
++_ACEOF
++
++ { echo "$as_me:$LINENO: result: Enabling compression support" >&5
++echo "${ECHO_T}Enabling compression support" >&6; }
++ { echo "$as_me:$LINENO: WARNING: Compression support is experimental" >&5
++echo "$as_me: WARNING: Compression support is experimental" >&2;}
++fi
++
++else
++ { echo "$as_me:$LINENO: result: Disabling compression support by default" >&5
++echo "${ECHO_T}Disabling compression support by default" >&6; }
++
++fi
++
++# Check whether --enable-htree was given.
++if test "${enable_htree+set}" = set; then
++ enableval=$enable_htree; if test "$enableval" = "no"
++then
++ HTREE_CMT=#
++ { echo "$as_me:$LINENO: result: Disabling htree directory support" >&5
++echo "${ECHO_T}Disabling htree directory support" >&6; }
++else
++ HTREE_CMT=
++ cat >>confdefs.h <<\_ACEOF
++#define ENABLE_HTREE 1
++_ACEOF
++
++ { echo "$as_me:$LINENO: result: Enabling htree directory support" >&5
++echo "${ECHO_T}Enabling htree directory support" >&6; }
++fi
++
++else
++ HTREE_CMT=
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_HTREE 1
++_ACEOF
+
+- -disable-* | --disable-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+- # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"enable_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval enable_$ac_useropt=no ;;
++{ echo "$as_me:$LINENO: result: Enabling htree directory support by default" >&5
++echo "${ECHO_T}Enabling htree directory support by default" >&6; }
+
+- -docdir | --docdir | --docdi | --doc | --do)
+- ac_prev=docdir ;;
+- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+- docdir=$ac_optarg ;;
++fi
+
+- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+- ac_prev=dvidir ;;
+- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+- dvidir=$ac_optarg ;;
+
+- -enable-* | --enable-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+- # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"enable_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval enable_$ac_useropt=\$ac_optarg ;;
++E2_PKG_CONFIG_STATIC=--static
++LDFLAG_DYNAMIC=
++PRIVATE_LIBS_CMT=
++# Check whether --enable-elf-shlibs was given.
++if test "${enable_elf_shlibs+set}" = set; then
++ enableval=$enable_elf_shlibs; if test "$enableval" = "no"
++then
++ ELF_CMT=#
++ MAKEFILE_ELF=/dev/null
++ { echo "$as_me:$LINENO: result: Disabling ELF shared libraries" >&5
++echo "${ECHO_T}Disabling ELF shared libraries" >&6; }
++else
++ E2_PKG_CONFIG_STATIC=
++ ELF_CMT=
++ MAKEFILE_ELF=$srcdir/lib/Makefile.elf-lib
++ case "$host_os" in
++ solaris2.*)
++ MAKEFILE_ELF=$srcdir/lib/Makefile.solaris-lib
++ ;;
++ esac
++ BINARY_TYPE=elfbin
++ LIB_EXT=.so
++ PRIVATE_LIBS_CMT=#
++ LDFLAG_DYNAMIC='-Wl,-rpath-link,$(top_builddir)/lib'
++ { echo "$as_me:$LINENO: result: Enabling ELF shared libraries" >&5
++echo "${ECHO_T}Enabling ELF shared libraries" >&6; }
++fi
+
+- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+- | --exec | --exe | --ex)
+- ac_prev=exec_prefix ;;
+- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+- | --exec=* | --exe=* | --ex=*)
+- exec_prefix=$ac_optarg ;;
++else
++ MAKEFILE_ELF=/dev/null
++ELF_CMT=#
++{ echo "$as_me:$LINENO: result: Disabling ELF shared libraries by default" >&5
++echo "${ECHO_T}Disabling ELF shared libraries by default" >&6; }
+
+- -gas | --gas | --ga | --g)
+- # Obsolete; use --with-gas.
+- with_gas=yes ;;
++fi
+
+- -help | --help | --hel | --he | -h)
+- ac_init_help=long ;;
+- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+- ac_init_help=recursive ;;
+- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+- ac_init_help=short ;;
+
+- -host | --host | --hos | --ho)
+- ac_prev=host_alias ;;
+- -host=* | --host=* | --hos=* | --ho=*)
+- host_alias=$ac_optarg ;;
+
+- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+- ac_prev=htmldir ;;
+- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+- | --ht=*)
+- htmldir=$ac_optarg ;;
++# Check whether --enable-bsd-shlibs was given.
++if test "${enable_bsd_shlibs+set}" = set; then
++ enableval=$enable_bsd_shlibs; if test "$enableval" = "no"
++then
++ BSDLIB_CMT=#
++ MAKEFILE_BSDLIB=/dev/null
++ { echo "$as_me:$LINENO: result: Disabling BSD shared libraries" >&5
++echo "${ECHO_T}Disabling BSD shared libraries" >&6; }
++else
++ E2_PKG_CONFIG_STATIC=
++ BSDLIB_CMT=
++ MAKEFILE_BSDLIB=$srcdir/lib/Makefile.bsd-lib
++ LIB_EXT=.so
++ case "$host_os" in
++ darwin*)
++ MAKEFILE_BSDLIB=$srcdir/lib/Makefile.darwin-lib
++ LIB_EXT=.dylib
++ ;;
++ esac
++ { echo "$as_me:$LINENO: result: Enabling BSD shared libraries" >&5
++echo "${ECHO_T}Enabling BSD shared libraries" >&6; }
++fi
+
+- -includedir | --includedir | --includedi | --included | --include \
+- | --includ | --inclu | --incl | --inc)
+- ac_prev=includedir ;;
+- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+- | --includ=* | --inclu=* | --incl=* | --inc=*)
+- includedir=$ac_optarg ;;
++else
++ MAKEFILE_BSDLIB=/dev/null
++BSDLIB_CMT=#
++{ echo "$as_me:$LINENO: result: Disabling BSD shared libraries by default" >&5
++echo "${ECHO_T}Disabling BSD shared libraries by default" >&6; }
+
+- -infodir | --infodir | --infodi | --infod | --info | --inf)
+- ac_prev=infodir ;;
+- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+- infodir=$ac_optarg ;;
++fi
+
+- -libdir | --libdir | --libdi | --libd)
+- ac_prev=libdir ;;
+- -libdir=* | --libdir=* | --libdi=* | --libd=*)
+- libdir=$ac_optarg ;;
+
+- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+- | --libexe | --libex | --libe)
+- ac_prev=libexecdir ;;
+- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+- | --libexe=* | --libex=* | --libe=*)
+- libexecdir=$ac_optarg ;;
+
+- -localedir | --localedir | --localedi | --localed | --locale)
+- ac_prev=localedir ;;
+- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+- localedir=$ac_optarg ;;
++# Check whether --enable-profile was given.
++if test "${enable_profile+set}" = set; then
++ enableval=$enable_profile; if test "$enableval" = "no"
++then
++ PROFILE_CMT=#
++ MAKEFILE_PROFILE=/dev/null
++ { echo "$as_me:$LINENO: result: Disabling profiling libraries" >&5
++echo "${ECHO_T}Disabling profiling libraries" >&6; }
++else
++ PROFILE_CMT=
++ MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
++ PROFILED_LIB_EXT=_p.a
++ { echo "$as_me:$LINENO: result: Building profiling libraries" >&5
++echo "${ECHO_T}Building profiling libraries" >&6; }
++fi
+
+- -localstatedir | --localstatedir | --localstatedi | --localstated \
+- | --localstate | --localstat | --localsta | --localst | --locals)
+- ac_prev=localstatedir ;;
+- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+- localstatedir=$ac_optarg ;;
++else
++ PROFILE_CMT=#
++MAKEFILE_PROFILE=/dev/null
++{ echo "$as_me:$LINENO: result: Disabling profiling libraries by default" >&5
++echo "${ECHO_T}Disabling profiling libraries by default" >&6; }
+
+- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+- ac_prev=mandir ;;
+- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+- mandir=$ac_optarg ;;
++fi
+
+- -nfp | --nfp | --nf)
+- # Obsolete; use --without-fp.
+- with_fp=no ;;
+
+- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+- | --no-cr | --no-c | -n)
+- no_create=yes ;;
+
+- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+- no_recursion=yes ;;
++# Check whether --enable-checker was given.
++if test "${enable_checker+set}" = set; then
++ enableval=$enable_checker; if test "$enableval" = "no"
++then
++ CHECKER_CMT=#
++ MAKEFILE_CHECKER=/dev/null
++ { echo "$as_me:$LINENO: result: Disabling checker libraries" >&5
++echo "${ECHO_T}Disabling checker libraries" >&6; }
++else
++ CHECKER_CMT=
++ MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
++ { echo "$as_me:$LINENO: result: Building checker libraries" >&5
++echo "${ECHO_T}Building checker libraries" >&6; }
++fi
+
+- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+- | --oldin | --oldi | --old | --ol | --o)
+- ac_prev=oldincludedir ;;
+- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+- oldincludedir=$ac_optarg ;;
++else
++ CHECKER_CMT=#
++MAKEFILE_CHECKER=/dev/null
++{ echo "$as_me:$LINENO: result: Disabling checker libraries by default" >&5
++echo "${ECHO_T}Disabling checker libraries by default" >&6; }
+
+- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+- ac_prev=prefix ;;
+- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+- prefix=$ac_optarg ;;
++fi
+
+- -program-prefix | --program-prefix | --program-prefi | --program-pref \
+- | --program-pre | --program-pr | --program-p)
+- ac_prev=program_prefix ;;
+- -program-prefix=* | --program-prefix=* | --program-prefi=* \
+- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+- program_prefix=$ac_optarg ;;
+
+- -program-suffix | --program-suffix | --program-suffi | --program-suff \
+- | --program-suf | --program-su | --program-s)
+- ac_prev=program_suffix ;;
+- -program-suffix=* | --program-suffix=* | --program-suffi=* \
+- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+- program_suffix=$ac_optarg ;;
+
+- -program-transform-name | --program-transform-name \
+- | --program-transform-nam | --program-transform-na \
+- | --program-transform-n | --program-transform- \
+- | --program-transform | --program-transfor \
+- | --program-transfo | --program-transf \
+- | --program-trans | --program-tran \
+- | --progr-tra | --program-tr | --program-t)
+- ac_prev=program_transform_name ;;
+- -program-transform-name=* | --program-transform-name=* \
+- | --program-transform-nam=* | --program-transform-na=* \
+- | --program-transform-n=* | --program-transform-=* \
+- | --program-transform=* | --program-transfor=* \
+- | --program-transfo=* | --program-transf=* \
+- | --program-trans=* | --program-tran=* \
+- | --progr-tra=* | --program-tr=* | --program-t=*)
+- program_transform_name=$ac_optarg ;;
+
+- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+- ac_prev=pdfdir ;;
+- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+- pdfdir=$ac_optarg ;;
+
+- -psdir | --psdir | --psdi | --psd | --ps)
+- ac_prev=psdir ;;
+- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+- psdir=$ac_optarg ;;
+
+- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+- | -silent | --silent | --silen | --sile | --sil)
+- silent=yes ;;
+
+- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+- ac_prev=sbindir ;;
+- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+- | --sbi=* | --sb=*)
+- sbindir=$ac_optarg ;;
+
+- -sharedstatedir | --sharedstatedir | --sharedstatedi \
+- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+- | --sharedst | --shareds | --shared | --share | --shar \
+- | --sha | --sh)
+- ac_prev=sharedstatedir ;;
+- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+- | --sha=* | --sh=*)
+- sharedstatedir=$ac_optarg ;;
++# Check whether --enable-jbd-debug was given.
++if test "${enable_jbd_debug+set}" = set; then
++ enableval=$enable_jbd_debug; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling journal debugging" >&5
++echo "${ECHO_T}Disabling journal debugging" >&6; }
++else
++ cat >>confdefs.h <<\_ACEOF
++#define CONFIG_JBD_DEBUG 1
++_ACEOF
+
+- -site | --site | --sit)
+- ac_prev=site ;;
+- -site=* | --site=* | --sit=*)
+- site=$ac_optarg ;;
++ { echo "$as_me:$LINENO: result: Enabling journal debugging" >&5
++echo "${ECHO_T}Enabling journal debugging" >&6; }
++fi
+
+- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+- ac_prev=srcdir ;;
+- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+- srcdir=$ac_optarg ;;
++else
++ { echo "$as_me:$LINENO: result: Disabling journal debugging by default" >&5
++echo "${ECHO_T}Disabling journal debugging by default" >&6; }
+
+- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+- | --syscon | --sysco | --sysc | --sys | --sy)
+- ac_prev=sysconfdir ;;
+- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+- sysconfdir=$ac_optarg ;;
++fi
++
++# Check whether --enable-blkid-debug was given.
++if test "${enable_blkid_debug+set}" = set; then
++ enableval=$enable_blkid_debug; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling blkid debugging" >&5
++echo "${ECHO_T}Disabling blkid debugging" >&6; }
++else
++ cat >>confdefs.h <<\_ACEOF
++#define CONFIG_BLKID_DEBUG 1
++_ACEOF
++
++ { echo "$as_me:$LINENO: result: Enabling blkid debugging" >&5
++echo "${ECHO_T}Enabling blkid debugging" >&6; }
++fi
+
+- -target | --target | --targe | --targ | --tar | --ta | --t)
+- ac_prev=target_alias ;;
+- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+- target_alias=$ac_optarg ;;
++else
++ { echo "$as_me:$LINENO: result: Disabling blkid debugging by default" >&5
++echo "${ECHO_T}Disabling blkid debugging by default" >&6; }
+
+- -v | -verbose | --verbose | --verbos | --verbo | --verb)
+- verbose=yes ;;
++fi
+
+- -version | --version | --versio | --versi | --vers | -V)
+- ac_init_version=: ;;
++# Check whether --enable-testio-debug was given.
++if test "${enable_testio_debug+set}" = set; then
++ enableval=$enable_testio_debug; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling testio debugging" >&5
++echo "${ECHO_T}Disabling testio debugging" >&6; }
++ TEST_IO_CMT="#"
++else
++ TEST_IO_CMT=
++ cat >>confdefs.h <<\_ACEOF
++#define CONFIG_TESTIO_DEBUG 1
++_ACEOF
+
+- -with-* | --with-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+- # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"with_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval with_$ac_useropt=\$ac_optarg ;;
++ { echo "$as_me:$LINENO: result: Enabling testio debugging" >&5
++echo "${ECHO_T}Enabling testio debugging" >&6; }
++fi
+
+- -without-* | --without-*)
+- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+- # Reject names that are not valid shell variable names.
+- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
+- ac_useropt_orig=$ac_useropt
+- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+- case $ac_user_opts in
+- *"
+-"with_$ac_useropt"
+-"*) ;;
+- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+- ac_unrecognized_sep=', ';;
+- esac
+- eval with_$ac_useropt=no ;;
++else
++ { echo "$as_me:$LINENO: result: Enabling testio debugging by default" >&5
++echo "${ECHO_T}Enabling testio debugging by default" >&6; }
++cat >>confdefs.h <<\_ACEOF
++#define CONFIG_TESTIO_DEBUG 1
++_ACEOF
+
+- --x)
+- # Obsolete; use --with-x.
+- with_x=yes ;;
++TEST_IO_CMT=
+
+- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+- | --x-incl | --x-inc | --x-in | --x-i)
+- ac_prev=x_includes ;;
+- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+- x_includes=$ac_optarg ;;
++fi
+
+- -x-libraries | --x-libraries | --x-librarie | --x-librari \
+- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+- ac_prev=x_libraries ;;
+- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+- x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
+- ;;
+
+- *=*)
+- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+- # Reject names that are not valid shell variable names.
+- case $ac_envvar in #(
+- '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+- esac
+- eval $ac_envvar=\$ac_optarg
+- export $ac_envvar ;;
+
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
+ *)
+- # FIXME: should be removed in autoconf 3.0.
+- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+- ;;
+-
+- esac
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
+ done
++IFS=$as_save_IFS
+
+-if test -n "$ac_prev"; then
+- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error "missing argument to $ac_option"
++ ;;
++esac
+ fi
+-
+-if test -n "$ac_unrecognized_opts"; then
+- case $enable_option_checking in
+- no) ;;
+- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+- esac
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+-# Check all directory arguments for consistency.
+-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+- datadir sysconfdir sharedstatedir localstatedir includedir \
+- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+- libdir localedir mandir
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
+ do
+- eval ac_val=\$$ac_var
+- # Remove trailing slashes.
+- case $ac_val in
+- */ )
+- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+- eval $ac_var=\$ac_val;;
+- esac
+- # Be sure to have absolute directory names.
+- case $ac_val in
+- [\\/$]* | ?:[\\/]* ) continue;;
+- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+- esac
+- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
+ done
++done
++IFS=$as_save_IFS
+
+-# There might be people who depend on the old broken behavior: `$host'
+-# used to hold the argument of --host etc.
+-# FIXME: To remove some day.
+-build=$build_alias
+-host=$host_alias
+-target=$target_alias
+-
+-# FIXME: To remove some day.
+-if test "x$host_alias" != x; then
+- if test "x$build_alias" = x; then
+- cross_compiling=maybe
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used." >&2
+- elif test "x$build_alias" != "x$host_alias"; then
+- cross_compiling=yes
+- fi
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+-ac_tool_prefix=
+-test -n "$host_alias" && ac_tool_prefix=$host_alias-
+-
+-test "$silent" = yes && exec 6>/dev/null
+-
+-
+-ac_pwd=`pwd` && test -n "$ac_pwd" &&
+-ac_ls_di=`ls -di .` &&
+-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error "working directory cannot be determined"
+-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error "pwd does not report name of working directory"
+-
+-
+-# Find the source files, if location was not specified.
+-if test -z "$srcdir"; then
+- ac_srcdir_defaulted=yes
+- # Try the directory containing this script, then the parent directory.
+- ac_confdir=`$as_dirname -- "$as_myself" ||
+-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_myself" : 'X\(//\)[^/]' \| \
+- X"$as_myself" : 'X\(//\)$' \| \
+- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_myself" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+- s//\1/
+- q
+- }
+- /^X\(\/\/\)[^/].*/{
+- s//\1/
+- q
+- }
+- /^X\(\/\/\)$/{
+- s//\1/
+- q
+- }
+- /^X\(\/\).*/{
+- s//\1/
+- q
+- }
+- s/.*/./; q'`
+- srcdir=$ac_confdir
+- if test ! -r "$srcdir/$ac_unique_file"; then
+- srcdir=..
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+ else
+- ac_srcdir_defaulted=no
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ 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=.
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ PKG_CONFIG=""
++ fi
++
+ fi
+-# Remove unnecessary trailing slashes from srcdir.
+-# Double slashes in file names in object file debugging info
+-# mess up M-x gdb in Emacs.
+-case $srcdir in
+-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++LIBUUID=
++DEPLIBUUID=
++STATIC_LIBUUID=
++DEPSTATIC_LIBUUID=
++PROFILED_LIBUUID=
++DEPPROFILED_LIBUUID=
++UUID_CMT=
++# Check whether --enable-libuuid was given.
++if test "${enable_libuuid+set}" = set; then
++ enableval=$enable_libuuid; if test "$enableval" = "no"
++then
++ if test -z "$PKG_CONFIG"; then
++ { { echo "$as_me:$LINENO: error: pkg-config not installed; please install it." >&5
++echo "$as_me: error: pkg-config not installed; please install it." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++
++ { echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
++echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
++if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-luuid $LIBUUID $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char uuid_generate ();
++int
++main ()
++{
++return uuid_generate ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-for ac_var in $ac_precious_vars; do
+- eval ac_env_${ac_var}_set=\${${ac_var}+set}
+- eval ac_env_${ac_var}_value=\$${ac_var}
+- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+- eval ac_cv_env_${ac_var}_value=\$${ac_var}
+-done
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_uuid_uuid_generate=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-#
+-# Report the --help message.
+-#
+-if test "$ac_init_help" = "long"; then
+- # Omit some internal or obsolete options to make the list less imposing.
+- # This message is too long to be a string in the A/UX 3.1 sh.
+- cat <<_ACEOF
+-\`configure' configures this package to adapt to many kinds of systems.
++ ac_cv_lib_uuid_uuid_generate=no
++fi
+
+-Usage: $0 [OPTION]... [VAR=VALUE]...
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
++echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
++if test $ac_cv_lib_uuid_uuid_generate = yes; then
++ LIBUUID=`$PKG_CONFIG --libs uuid`;
++ STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`
++else
++ { { echo "$as_me:$LINENO: error: external uuid library not found" >&5
++echo "$as_me: error: external uuid library not found" >&2;}
++ { (exit 1); exit 1; }; }
++fi
+
+-To assign environment variables (e.g., CC, CFLAGS...), specify them as
+-VAR=VALUE. See below for descriptions of some of the useful variables.
++ UUID_CMT=#
++ { echo "$as_me:$LINENO: result: Disabling private uuid library" >&5
++echo "${ECHO_T}Disabling private uuid library" >&6; }
++else
++ LIBUUID='$(LIB)/libuuid'$LIB_EXT
++ DEPLIBUUID=$LIBUUID
++ STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
++ DEPSTATIC_LIBUUID=$STATIC_LIBUUID
++ PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
++ DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
++ { echo "$as_me:$LINENO: result: Enabling private uuid library" >&5
++echo "${ECHO_T}Enabling private uuid library" >&6; }
++fi
+
+-Defaults for the options are specified in brackets.
++else
++ LIBUUID='$(LIB)/libuuid'$LIB_EXT
++DEPLIBUUID=$LIBUUID
++STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
++DEPSTATIC_LIBUUID=$STATIC_LIBUUID
++PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
++DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
++{ echo "$as_me:$LINENO: result: Enabling private uuid library by default" >&5
++echo "${ECHO_T}Enabling private uuid library by default" >&6; }
+
+-Configuration:
+- -h, --help display this help and exit
+- --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
+- -q, --quiet, --silent do not print \`checking...' messages
+- --cache-file=FILE cache test results in FILE [disabled]
+- -C, --config-cache alias for \`--cache-file=config.cache'
+- -n, --no-create do not create output files
+- --srcdir=DIR find the sources in DIR [configure dir or \`..']
++fi
+
+-Installation directories:
+- --prefix=PREFIX install architecture-independent files in PREFIX
+- [$ac_default_prefix]
+- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+- [PREFIX]
+
+-By default, \`make install' will install all the files in
+-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+-for instance \`--prefix=\$HOME'.
+
+-For better control, use the options below.
+
+-Fine tuning of the installation directories:
+- --bindir=DIR user executables [EPREFIX/bin]
+- --sbindir=DIR system admin executables [EPREFIX/sbin]
+- --libexecdir=DIR program executables [EPREFIX/libexec]
+- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+- --libdir=DIR object code libraries [EPREFIX/lib]
+- --includedir=DIR C header files [PREFIX/include]
+- --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+- --infodir=DIR info documentation [DATAROOTDIR/info]
+- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+- --mandir=DIR man documentation [DATAROOTDIR/man]
+- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+- --htmldir=DIR html documentation [DOCDIR]
+- --dvidir=DIR dvi documentation [DOCDIR]
+- --pdfdir=DIR pdf documentation [DOCDIR]
+- --psdir=DIR ps documentation [DOCDIR]
+-_ACEOF
+
+- cat <<\_ACEOF
+
+-System types:
+- --build=BUILD configure for building on BUILD [guessed]
+- --host=HOST cross-compile to build programs to run on HOST [BUILD]
+-_ACEOF
+-fi
+
+-if test -n "$ac_init_help"; then
+
+- cat <<\_ACEOF
+
+-Optional Features:
+- --disable-option-checking ignore unrecognized --enable/--with options
+- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+- --enable-maintainer-mode enable makefile rules useful for maintainers
+- --enable-verbose-makecmds enable verbose make command output
+- --enable-compression enable EXPERIMENTAL compression support
+- --enable-htree enable EXPERIMENTAL htree directory support
+- --enable-elf-shlibs select ELF shared libraries
+- --enable-bsd-shlibs select BSD shared libraries
+- --enable-profile build profiling libraries
+- --enable-checker build checker libraries
+- --enable-jbd-debug enable journal debugging
+- --enable-blkid-debug enable blkid debugging
+- --disable-testio-debug disable the use of the test I/O manager for debugging
+- --disable-libuuid do not build private uuid library
+- --disable-libblkid do not build private blkid library
+- --disable-debugfs disable support of debugfs program
+- --disable-imager disable support of e2image program
+- --disable-resizer disable support of e2resize program
+- --enable-fsck build fsck wrapper program
+- --enable-e2initrd-helper build e2initrd-helper program
+- --disable-tls disable use of thread local support
+- --disable-uuidd disable building the uuid daemon
+- --disable-nls do not use Native Language Support
+- --disable-rpath do not hardcode runtime library paths
+
+-Optional Packages:
+- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --with-diet-libc use diet libc
+- --with-cc no longer supported, use CC= instead
+- --with-ccopts no longer supported, use CFLAGS= instead
+- --with-ldopts no longer supported, use LDFLAGS= instead
+- --with-root-prefix=PREFIX override prefix variable for files to be placed in the root
+- --with-gnu-ld assume the C compiler uses GNU ld default=no
+- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+- --without-libiconv-prefix don't search for libiconv in includedir and libdir
+- --with-included-gettext use the GNU gettext library included here
+- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+- --without-libintl-prefix don't search for libintl in includedir and libdir
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+-Some influential environment variables:
+- CC C compiler command
+- CFLAGS C compiler flags
+- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+- nonstandard directory <lib dir>
+- LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+- you have headers in a nonstandard directory <include dir>
+- CPP C preprocessor
+- PKG_CONFIG path to pkg-config utility
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-Use these variables to override the choices made by `configure' or to help
+-it to find libraries and programs with nonstandard names/locations.
+
+-Report bugs to the package provider.
+-_ACEOF
+-ac_status=$?
+ fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+-if test "$ac_init_help" = "recursive"; then
+- # If there are subdirs, report their specific --help.
+- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
+- ac_builddir=.
+-
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+- # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+- case $ac_top_builddir_sub in
+- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+- esac ;;
++ ;;
+ esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-case $srcdir in
+- .) # We are building in place.
+- ac_srcdir=.
+- ac_top_srcdir=$ac_top_builddir_sub
+- ac_abs_top_srcdir=$ac_pwd ;;
+- [\\/]* | ?:[\\/]* ) # Absolute name.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- 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 ;;
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
+ esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
+
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
+ fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ PKG_CONFIG=""
++ fi
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-configure
+-generated by GNU Autoconf 2.64
++fi
++LIBBLKID=
++DEPLIBBLKID=
++STATIC_LIBBLKID=
++DEPSTATIC_LIBBLKID=
++PROFILED_LIBBLKID=
++DEPPROFILED_LIBBLKID=
++BLKID_CMT=
++# Check whether --enable-libblkid was given.
++if test "${enable_libblkid+set}" = set; then
++ enableval=$enable_libblkid; if test "$enableval" = "no"
++then
++ if test -z "$PKG_CONFIG"; then
++ { { echo "$as_me:$LINENO: error: pkg-config not installed; please install it." >&5
++echo "$as_me: error: pkg-config not installed; please install it." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
++ { echo "$as_me:$LINENO: checking for blkid_get_cache in -lblkid" >&5
++echo $ECHO_N "checking for blkid_get_cache in -lblkid... $ECHO_C" >&6; }
++if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lblkid $LIBBLKID $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+- exit
+-fi
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-## ------------------------ ##
+-## Autoconf initialization. ##
+-## ------------------------ ##
+-
+-# ac_fn_c_try_compile LINENO
+-# --------------------------
+-# Try to compile conftest.$ac_ext, and return whether this succeeded.
+-ac_fn_c_try_compile ()
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char blkid_get_cache ();
++int
++main ()
+ {
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- rm -f conftest.$ac_objext
+- if { { ac_try="$ac_compile"
++return blkid_get_cache ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_compile") 2>conftest.err
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+- if test -s conftest.err; then
+- grep -v '^ *+' conftest.err >conftest.er1
+- cat conftest.er1 >&5
+- mv -f conftest.er1 conftest.err
+- fi
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && {
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then :
+- ac_retval=0
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_blkid_blkid_get_cache=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_retval=1
++ ac_cv_lib_blkid_blkid_get_cache=no
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
+
+-} # ac_fn_c_try_compile
+-
+-# ac_fn_c_try_link LINENO
+-# -----------------------
+-# Try to link conftest.$ac_ext, and return whether this succeeded.
+-ac_fn_c_try_link ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- rm -f conftest.$ac_objext conftest$ac_exeext
+- if { { ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_link") 2>conftest.err
+- ac_status=$?
+- if test -s conftest.err; then
+- grep -v '^ *+' conftest.err >conftest.er1
+- cat conftest.er1 >&5
+- mv -f conftest.er1 conftest.err
+- fi
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then :
+- ac_retval=0
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
++echo "${ECHO_T}$ac_cv_lib_blkid_blkid_get_cache" >&6; }
++if test $ac_cv_lib_blkid_blkid_get_cache = yes; then
++ LIBBLKID=`$PKG_CONFIG --libs blkid`;
++ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_retval=1
++ { { echo "$as_me:$LINENO: error: external blkid library not found" >&5
++echo "$as_me: error: external blkid library not found" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+- # interfere with the next link command; also delete a directory that is
+- # left behind by Apple's compiler. We do this before executing the actions.
+- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
+-
+-} # ac_fn_c_try_link
+
+-# ac_fn_c_try_cpp LINENO
+-# ----------------------
+-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+-ac_fn_c_try_cpp ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { { ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+- ac_status=$?
+- if test -s conftest.err; then
+- grep -v '^ *+' conftest.err >conftest.er1
+- cat conftest.er1 >&5
+- mv -f conftest.er1 conftest.err
+- fi
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then :
+- ac_retval=0
++ BLKID_CMT=#
++ { echo "$as_me:$LINENO: result: Disabling private blkid library" >&5
++echo "${ECHO_T}Disabling private blkid library" >&6; }
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ LIBBLKID='$(LIB)/libblkid'$LIB_EXT
++ DEPLIBBLKID=$LIBBLKID
++ STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
++ DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
++ PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
++ DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
++ cat >>confdefs.h <<\_ACEOF
++#define CONFIG_BUILD_FINDFS 1
++_ACEOF
+
+- ac_retval=1
++ { echo "$as_me:$LINENO: result: Enabling private blkid library" >&5
++echo "${ECHO_T}Enabling private blkid library" >&6; }
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
+
+-} # ac_fn_c_try_cpp
+-
+-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+-# -------------------------------------------------------
+-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+-# the include files in INCLUDES and setting the cache variable VAR
+-# accordingly.
+-ac_fn_c_check_header_mongrel ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-fi
+-eval ac_res=\$$3
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+ else
+- # Is the header compilable?
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+-$as_echo_n "checking $2 usability... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-#include <$2>
++ LIBBLKID='$(LIB)/libblkid'$LIB_EXT
++DEPLIBBLKID=$LIBBLKID
++STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
++DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
++PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
++DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
++cat >>confdefs.h <<\_ACEOF
++#define CONFIG_BUILD_FINDFS 1
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_header_compiler=yes
+-else
+- ac_header_compiler=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+
+-# Is the header present?
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+-$as_echo_n "checking $2 presence... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <$2>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+- ac_header_preproc=yes
+-else
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: Enabling private blkid library by default" >&5
++echo "${ECHO_T}Enabling private blkid library by default" >&6; }
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+- yes:no: )
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+- ;;
+-esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$3=\$ac_header_compiler"
+ fi
+-eval ac_res=\$$3
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+-} # ac_fn_c_check_header_mongrel
+
+-# ac_fn_c_try_run LINENO
+-# ----------------------
+-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+-# that executables *can* be run.
+-ac_fn_c_try_run ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { { ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+- { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then :
+- ac_retval=0
+-else
+- $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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
+
+-} # ac_fn_c_try_run
+
+-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+-# -------------------------------------------------------
+-# Tests whether HEADER exists and can be compiled using the include files in
+-# INCLUDES, setting the cache variable VAR accordingly.
+-ac_fn_c_check_header_compile ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-#include <$2>
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- eval "$3=yes"
+-else
+- eval "$3=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-eval ac_res=\$$3
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+-} # ac_fn_c_check_header_compile
+
+-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+-# -------------------------------------------
+-# Tests whether TYPE exists after having included INCLUDES, setting cache
+-# variable VAR accordingly.
+-ac_fn_c_check_type ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$3=no"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-if (sizeof ($2))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-if (sizeof (($2)))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+
++# Check whether --enable-debugfs was given.
++if test "${enable_debugfs+set}" = set; then
++ enableval=$enable_debugfs; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling debugfs support" >&5
++echo "${ECHO_T}Disabling debugfs support" >&6; }
++ DEBUGFS_CMT="#"
+ else
+- eval "$3=yes"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ DEBUGFS_CMT=
++ { echo "$as_me:$LINENO: result: Enabling debugfs support" >&5
++echo "${ECHO_T}Enabling debugfs support" >&6; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++else
++ { echo "$as_me:$LINENO: result: Enabling debugfs support by default" >&5
++echo "${ECHO_T}Enabling debugfs support by default" >&6; }
++DEBUGFS_CMT=
++
+ fi
+-eval ac_res=\$$3
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+-} # ac_fn_c_check_type
+
+-# ac_fn_c_check_func LINENO FUNC VAR
+-# ----------------------------------
+-# Tests whether FUNC exists, setting the cache variable VAR accordingly
+-ac_fn_c_check_func ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
++# Check whether --enable-imager was given.
++if test "${enable_imager+set}" = set; then
++ enableval=$enable_imager; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling e2image support" >&5
++echo "${ECHO_T}Disabling e2image support" >&6; }
++ IMAGER_CMT="#"
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $2 innocuous_$2
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $2 (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++ IMAGER_CMT=
++ { echo "$as_me:$LINENO: result: Enabling e2image support" >&5
++echo "${ECHO_T}Enabling e2image support" >&6; }
++fi
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++else
++ { echo "$as_me:$LINENO: result: Enabling e2image support by default" >&5
++echo "${ECHO_T}Enabling e2image support by default" >&6; }
++IMAGER_CMT=
+
+-#undef $2
++fi
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $2 ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$2 || defined __stub___$2
+-choke me
+-#endif
+
+-int
+-main ()
+-{
+-return $2 ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- eval "$3=yes"
++# Check whether --enable-resizer was given.
++if test "${enable_resizer+set}" = set; then
++ enableval=$enable_resizer; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Disabling e2resize support" >&5
++echo "${ECHO_T}Disabling e2resize support" >&6; }
++ RESIZER_CMT="#"
+ else
+- eval "$3=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++ RESIZER_CMT=
++ { echo "$as_me:$LINENO: result: Enabling e2resize support" >&5
++echo "${ECHO_T}Enabling e2resize support" >&6; }
+ fi
+-eval ac_res=\$$3
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+-} # ac_fn_c_check_func
++else
++ { echo "$as_me:$LINENO: result: Enabling e2resize support by default" >&5
++echo "${ECHO_T}Enabling e2resize support by default" >&6; }
++RESIZER_CMT=
+
+-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+-# --------------------------------------------
+-# Tries to find the compile-time value of EXPR in a program that includes
+-# INCLUDES, setting VAR accordingly. Returns whether the value could be
+-# computed
+-ac_fn_c_compute_int ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) >= 0)];
+-test_array [0] = 0
++fi
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_hi=$ac_mid; break
++# Check whether --enable-fsck was given.
++if test "${enable_fsck+set}" = set; then
++ enableval=$enable_fsck; if test "$enableval" = "no"
++then
++ FSCK_PROG='' FSCK_MAN=''
++ { echo "$as_me:$LINENO: result: Not building fsck wrapper" >&5
++echo "${ECHO_T}Not building fsck wrapper" >&6; }
+ else
+- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
++ FSCK_PROG=fsck FSCK_MAN=fsck.8
++ { echo "$as_me:$LINENO: result: Building fsck wrapper" >&5
++echo "${ECHO_T}Building fsck wrapper" >&6; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
++
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) < 0)];
+-test_array [0] = 0
++ case "$host_os" in
++ gnu*)
++ FSCK_PROG='' FSCK_MAN=''
++ { echo "$as_me:$LINENO: result: Not building fsck wrapper by default" >&5
++echo "${ECHO_T}Not building fsck wrapper by default" >&6; }
++ ;;
++ *)
++ FSCK_PROG=fsck FSCK_MAN=fsck.8
++ { echo "$as_me:$LINENO: result: Building fsck wrapper by default" >&5
++echo "${ECHO_T}Building fsck wrapper by default" >&6; }
++esac
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+-test_array [0] = 0
++fi
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_lo=$ac_mid; break
++
++
++# Check whether --enable-e2initrd-helper was given.
++if test "${enable_e2initrd_helper+set}" = set; then
++ enableval=$enable_e2initrd_helper; if test "$enableval" = "no"
++then
++ E2INITRD_PROG='' E2INITRD_MAN=''
++ { echo "$as_me:$LINENO: result: Not building e2initrd helper" >&5
++echo "${ECHO_T}Not building e2initrd helper" >&6; }
+ else
+- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
++ E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
++ { echo "$as_me:$LINENO: result: Building e2initrd helper" >&5
++echo "${ECHO_T}Building e2initrd helper" >&6; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
++
+ else
+- ac_lo= ac_hi=
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
++{ echo "$as_me:$LINENO: result: Building e2initrd helper by default" >&5
++echo "${ECHO_T}Building e2initrd helper by default" >&6; }
++
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_hi=$ac_mid
++
++
++# Check whether --enable-tls was given.
++if test "${enable_tls+set}" = set; then
++ enableval=$enable_tls; if test "$enableval" = "no"
++then
++ try_tls=""
++ { echo "$as_me:$LINENO: result: Disabling thread local support" >&5
++echo "${ECHO_T}Disabling thread local support" >&6; }
+ else
+- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
++ try_tls="yes"
++ { echo "$as_me:$LINENO: result: Enabling thread local support" >&5
++echo "${ECHO_T}Enabling thread local support" >&6; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in #((
+-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+-'') ac_retval=1 ;;
+-esac
+- else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-static long int longval () { return $2; }
+-static unsigned long int ulongval () { return $2; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- return 1;
+- if (($2) < 0)
+- {
+- long int i = longval ();
+- if (i != ($2))
+- return 1;
+- fprintf (f, "%ld", i);
+- }
+- else
+- {
+- unsigned long int i = ulongval ();
+- if (i != ($2))
+- return 1;
+- fprintf (f, "%lu", i);
+- }
+- /* Do not output a trailing newline, as this causes \r\n confusion
+- on some platforms. */
+- return ferror (f) || fclose (f) != 0;
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+ else
+- ac_retval=1
++ if test -n "$WITH_DIET_LIBC"
++then
++ try_tls=""
++ { echo "$as_me:$LINENO: result: Diet libc does not support thread local support" >&5
++echo "${ECHO_T}Diet libc does not support thread local support" >&6; }
++else
++ try_tls="yes"
++ { echo "$as_me:$LINENO: result: Try using thread local support by default" >&5
++echo "${ECHO_T}Try using thread local support by default" >&6; }
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -f conftest.val
+
+- fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++fi
+
+-} # ac_fn_c_compute_int
++if test "$try_tls" = "yes"
++then
+
+-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+-# ----------------------------------------------------
+-# Tries to find if the field MEMBER exists in type AGGR, after including
+-# INCLUDES, setting cache variable VAR accordingly.
+-ac_fn_c_check_member ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+-$as_echo_n "checking for $2.$3... " >&6; }
+-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for thread local storage (TLS) class" >&5
++echo $ECHO_N "checking for thread local storage (TLS) class... $ECHO_C" >&6; }
++ if test "${ac_cv_tls+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$5
+-int
+-main ()
+-{
+-static $2 ac_aggr;
+-if (ac_aggr.$3)
+-return 0;
+- ;
+- return 0;
+-}
++
++ ax_tls_keywords="__thread __declspec(thread) none"
++ for ax_tls_keyword in $ax_tls_keywords; do
++ case $ax_tls_keyword in
++ none) ac_cv_tls=none ; break ;;
++ *)
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- eval "$4=yes"
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$5
++#include <stdlib.h>
++ static void
++ foo(void) {
++ static $ax_tls_keyword int bar;
++ exit(1);
++ }
+ int
+ main ()
+ {
+-static $2 ac_aggr;
+-if (sizeof ac_aggr.$3)
+-return 0;
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- eval "$4=yes"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_tls=$ax_tls_keyword ; break
+ else
+- eval "$4=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_tls=none
++
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ esac
++ done
++
+ fi
+-eval ac_res=\$$4
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+-} # ac_fn_c_check_member
+
+-# ac_fn_c_check_decl LINENO SYMBOL VAR
+-# ------------------------------------
+-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+-ac_fn_c_check_decl ()
+-{
+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+-$as_echo_n "checking whether $2 is declared... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$4
+-int
+-main ()
+-{
+-#ifndef $2
+- (void) $2;
+-#endif
++ if test "$ac_cv_tls" != "none"; then
+
+- ;
+- return 0;
+-}
++cat >>confdefs.h <<_ACEOF
++#define TLS $ac_cv_tls
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- eval "$3=yes"
++
++ fi
++ { echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
++echo "${ECHO_T}$ac_cv_tls" >&6; }
++
++fi
++# Check whether --enable-uuidd was given.
++if test "${enable_uuidd+set}" = set; then
++ enableval=$enable_uuidd; if test "$enableval" = "no"
++then
++ { echo "$as_me:$LINENO: result: Not building uuidd" >&5
++echo "${ECHO_T}Not building uuidd" >&6; }
++ UUIDD_CMT="#"
+ else
+- eval "$3=no"
++ cat >>confdefs.h <<\_ACEOF
++#define USE_UUIDD 1
++_ACEOF
++
++ UUIDD_CMT=""
++ { echo "$as_me:$LINENO: result: Building uuidd" >&5
++echo "${ECHO_T}Building uuidd" >&6; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++else
++ cat >>confdefs.h <<\_ACEOF
++#define USE_UUIDD 1
++_ACEOF
++
++UUIDD_CMT=""
++{ echo "$as_me:$LINENO: result: Building uuidd by default" >&5
++echo "${ECHO_T}Building uuidd by default" >&6; }
++
+ fi
+-eval ac_res=\$$3
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+-} # ac_fn_c_check_decl
+-cat >config.log <<_ACEOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+
+-It was created by $as_me, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
+
+- $ $0 $@
++GETTEXT_PACKAGE=e2fsprogs
++PACKAGE=e2fsprogs
++VERSION="$E2FSPROGS_VERSION"
++VERSION=0.14.1
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE "$PACKAGE"
++_ACEOF
+
++cat >>confdefs.h <<_ACEOF
++#define VERSION "$VERSION"
+ _ACEOF
+-exec 5>>config.log
+-{
+-cat <<_ASUNAME
+-## --------- ##
+-## 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`
+
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+-/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`
+-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+-/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`
+
+-_ASUNAME
+
+-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
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
++all:
++ @echo '@@@%%%=$(MAKE)=@@@%%%'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++ *@@@%%%=?*=@@@%%%*)
++ eval ac_cv_prog_make_${ac_make}_set=yes;;
++ *)
++ eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
++rm -f conftest.make
++fi
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ SET_MAKE=
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# 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.
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
++if test -z "$INSTALL"; then
++if test "${ac_cv_path_install+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++ ./ | .// | /cC/* | \
++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++ /usr/ucb/* ) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ # Don't use installbsd from OSF since it installs stuff as root
++ # by default.
++ for ac_prog in ginstall scoinst install; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ 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.
++ :
++ 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
++ done
++ done
++ ;;
++esac
++done
++IFS=$as_save_IFS
++
++
++fi
++ if test "${ac_cv_path_install+set}" = set; then
++ INSTALL=$ac_cv_path_install
++ else
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
++ # break other packages using the cache if that directory is
++ # removed, or if the value is a relative name.
++ INSTALL=$ac_install_sh
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ case "$ac_aux_dir" in
++ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
++ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
++ esac
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
+
+-} >&5
+
+-cat >&5 <<_ACEOF
+
++ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
++ # Check whether --enable-nls was given.
++if test "${enable_nls+set}" = set; then
++ enableval=$enable_nls; USE_NLS=$enableval
++else
++ USE_NLS=yes
++fi
+
+-## ----------- ##
+-## Core tests. ##
+-## ----------- ##
++ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
++echo "${ECHO_T}$USE_NLS" >&6; }
+
+-_ACEOF
+
+
+-# Keep a trace of the command line.
+-# Strip out --no-create and --no-recursion so they do not pile up.
+-# Strip out --silent because we don't want to record it for future runs.
+-# Also quote any args containing shell meta-characters.
+-# Make two passes to allow for proper duplicate-argument suppression.
+-ac_configure_args=
+-ac_configure_args0=
+-ac_configure_args1=
+-ac_must_keep_next=false
+-for ac_pass in 1 2
+-do
+- for ac_arg
+- do
+- case $ac_arg in
+- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+- | -silent | --silent | --silen | --sile | --sil)
+- continue ;;
+- *\'*)
+- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- esac
+- case $ac_pass in
+- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+- 2)
+- 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.
+- else
+- 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
+- as_fn_append ac_configure_args " '$ac_arg'"
+- ;;
+- esac
+- done
+-done
+-{ ac_configure_args0=; unset ac_configure_args0;}
+-{ ac_configure_args1=; unset ac_configure_args1;}
+
+-# When interrupted or exit'd, cleanup temporary files, and complete
+-# config.log. We remove comments because anyway the quotes in there
+-# would cause problems or look ugly.
+-# WARNING: Use '\'' to represent an apostrophe within the trap.
+-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+-trap 'exit_status=$?
+- # Save into config.log some information that might help in debugging.
+- {
+- echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
+-## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
+- echo
+- # The following way of writing the cache mishandles newlines in values,
+-(
+- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+- eval ac_val=\$$ac_var
+- case $ac_val in #(
+- *${as_nl}*)
+- case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+- esac
+- case $ac_var in #(
+- _ | IFS | as_nl) ;; #(
+- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+- *) { eval $ac_var=; unset $ac_var;} ;;
+- esac ;;
+- esac
+- done
+- (set) 2>&1 |
+- 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"
+- ;; #(
+- *)
+- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+- ;;
+- esac |
+- sort
+-)
+- echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
+-## Output variables. ##
+-## ----------------- ##
+-_ASBOX
+- echo
+- for ac_var in $ac_subst_vars
+- do
+- eval ac_val=\$$ac_var
+- case $ac_val in
+- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+- esac
+- $as_echo "$ac_var='\''$ac_val'\''"
+- done | sort
+- echo
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
+
+- if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------------- ##
+-## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
+- echo
+- for ac_var in $ac_subst_files
+- do
+- eval ac_val=\$$ac_var
+- case $ac_val in
+- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+- esac
+- $as_echo "$ac_var='\''$ac_val'\''"
+- done | sort
+- echo
+- fi
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
++else
++ ac_executable_p="test -f"
++fi
++rm -f conf$$.file
+
+- if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
+-## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
+- echo
+- cat confdefs.h
+- echo
+- fi
+- test "$ac_signal" != 0 &&
+- $as_echo "$as_me: caught signal $ac_signal"
+- $as_echo "$as_me: exit $exit_status"
+- } >&5
+- rm -f core *.core core.conftest.* &&
+- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+- exit $exit_status
+-' 0
+-for ac_signal in 1 2 13 15; do
+- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
++# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case "$MSGFMT" in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
++ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
++ ;;
++esac
++fi
++MSGFMT="$ac_cv_path_MSGFMT"
++if test "$MSGFMT" != ":"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ # Extract the first word of "gmsgfmt", so it can be a program name with args.
++set dummy gmsgfmt; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_GMSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $GMSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
+ done
+-ac_signal=0
++done
++IFS=$as_save_IFS
+
+-# confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -f -r conftest* confdefs.h
++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++ ;;
++esac
++fi
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-$as_echo "/* confdefs.h */" > confdefs.h
+
+-# Predefined preprocessor variables.
+
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_NAME "$PACKAGE_NAME"
+-_ACEOF
+
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+-_ACEOF
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
+
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_VERSION "$PACKAGE_VERSION"
+-_ACEOF
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
++else
++ ac_executable_p="test -f"
++fi
++rm -f conf$$.file
+
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_STRING "$PACKAGE_STRING"
+-_ACEOF
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case "$XGETTEXT" in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
++ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
++ ;;
++esac
++fi
++XGETTEXT="$ac_cv_path_XGETTEXT"
++if test "$XGETTEXT" != ":"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+-_ACEOF
++ rm -f messages.po
+
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_URL "$PACKAGE_URL"
+-_ACEOF
+
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
+
+-# Let the site file select an alternate cache file if it wants to.
+-# Prefer an explicitly selected file to automatically selected ones.
+-ac_site_file1=NONE
+-ac_site_file2=NONE
+-if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
+-elif test "x$prefix" != xNONE; then
+- ac_site_file1=$prefix/share/config.site
+- ac_site_file2=$prefix/etc/config.site
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
+ else
+- ac_site_file1=$ac_default_prefix/share/config.site
+- ac_site_file2=$ac_default_prefix/etc/config.site
++ ac_executable_p="test -f"
+ fi
+-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+-do
+- test "x$ac_site_file" = xNONE && continue
+- if test -r "$ac_site_file"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+- sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file"
+- fi
+-done
++rm -f conf$$.file
+
+-if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+-$as_echo "$as_me: loading cache $cache_file" >&6;}
+- case $cache_file in
+- [\\/]* | ?:[\\/]* ) . "$cache_file";;
+- *) . "./$cache_file";;
+- esac
+- fi
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+-$as_echo "$as_me: creating cache $cache_file" >&6;}
+- >$cache_file
++ case "$MSGMERGE" in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
++ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
++ ;;
++esac
++fi
++MSGMERGE="$ac_cv_path_MSGMERGE"
++if test "$MSGMERGE" != ":"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+-# Check that the precious variables saved in the cache have kept the same
+-# value.
+-ac_cache_corrupted=false
+-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
+- eval ac_old_val=\$ac_cv_env_${ac_var}_value
+- eval ac_new_val=\$ac_env_${ac_var}_value
+- case $ac_old_set,$ac_new_set in
+- set,)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+- ac_cache_corrupted=: ;;
+- ,set)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+- ac_cache_corrupted=: ;;
+- ,);;
+- *)
+- if test "x$ac_old_val" != "x$ac_new_val"; then
+- # 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`
+- if test "$ac_old_val_w" != "$ac_new_val_w"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+- ac_cache_corrupted=:
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+- eval $ac_var=\$ac_old_val
+- fi
+- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+- fi;;
+- esac
+- # Pass precious variables to config.status.
+- if test "$ac_new_set" = set; then
+- case $ac_new_val in
+- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+- *) ac_arg=$ac_var=$ac_new_val ;;
+- esac
+- case " $ac_configure_args " in
+- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+- esac
++
++ if test "$GMSGFMT" != ":"; then
++ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
++ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ : ;
++ else
++ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
++ { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
++ GMSGFMT=":"
++ fi
+ fi
+-done
+-if $ac_cache_corrupted; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+-fi
+-## -------------------- ##
+-## Main body of script. ##
+-## -------------------- ##
+
+-ac_ext=c
+-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
++ if test "$XGETTEXT" != ":"; then
++ if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
++ (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ : ;
++ else
++ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
++ XGETTEXT=":"
++ fi
++ rm -f messages.po
++ fi
+
++ ac_config_commands="$ac_config_commands default-1"
+
+
+-ac_aux_dir=
+-for ac_dir in config "$srcdir"/config; do
+- for ac_t in install-sh install.sh shtool; do
+- if test -f "$ac_dir/$ac_t"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
+- break 2
+- fi
+- done
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$RANLIB"; then
++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
+ done
+-if test -z "$ac_aux_dir"; then
+- as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+-fi
+-
+-# 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
+-# whose full name contains unusual characters.
+-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.
++done
++IFS=$as_save_IFS
+
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-MCONFIG=./MCONFIG
+
+-BINARY_TYPE=bin
+-E2FSPROGS_VERSION=`grep E2FSPROGS_VERSION ${srcdir}/version.h \
+- | awk '{print $3}' | tr \" " " | awk '{print $1}'`
+-DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
+- | tr \" " "`
+-E2FSPROGS_DAY=`echo $DATE | awk -F- '{print $1}'`
+-MONTH=`echo $DATE | awk -F- '{print $2}'`
+-YEAR=`echo $DATE | awk -F- '{print $3}'`
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++ ac_ct_RANLIB=$RANLIB
++ # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_RANLIB"; then
++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_RANLIB="ranlib"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+-if expr $YEAR ">" 1900 > /dev/null ; then
+- E2FSPROGS_YEAR=$YEAR
+-elif expr $YEAR ">" 90 >/dev/null ; then
+- E2FSPROGS_YEAR=19$YEAR
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+- E2FSPROGS_YEAR=20$YEAR
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+-case $MONTH in
+-Jan) MONTH_NUM=01; E2FSPROGS_MONTH="January" ;;
+-Feb) MONTH_NUM=02; E2FSPROGS_MONTH="February" ;;
+-Mar) MONTH_NUM=03; E2FSPROGS_MONTH="March" ;;
+-Apr) MONTH_NUM=04; E2FSPROGS_MONTH="April" ;;
+-May) MONTH_NUM=05; E2FSPROGS_MONTH="May" ;;
+-Jun) MONTH_NUM=06; E2FSPROGS_MONTH="June" ;;
+-Jul) MONTH_NUM=07; E2FSPROGS_MONTH="July" ;;
+-Aug) MONTH_NUM=08; E2FSPROGS_MONTH="August" ;;
+-Sep) MONTH_NUM=09; E2FSPROGS_MONTH="September" ;;
+-Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
+-Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
+-Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
+-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown month $MONTH??" >&5
+-$as_echo "$as_me: WARNING: Unknown month $MONTH??" >&2;} ;;
++ if test "x$ac_ct_RANLIB" = x; then
++ RANLIB=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
+ esac
++ RANLIB=$ac_ct_RANLIB
++ fi
++else
++ RANLIB="$ac_cv_prog_RANLIB"
++fi
+
+-base_ver=`echo $E2FSPROGS_VERSION | \
+- sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS//'`
+
+-date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
++ { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
++echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
++if test "${ac_cv_lib_cposix_strerror+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcposix $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-case $E2FSPROGS_VERSION in
+-*-WIP|pre-*)
+- E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
+- ;;
+-*)
+- E2FSPROGS_PKGVER="$base_ver"
+- ;;
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char strerror ();
++int
++main ()
++{
++return strerror ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_cposix_strerror=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-unset DATE MONTH YEAR base_ver pre_vers date_spec
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&5
+-$as_echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&5
+-$as_echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&6; }
++ ac_cv_lib_cposix_strerror=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
++if test $ac_cv_lib_cposix_strerror = yes; then
++ LIBS="$LIBS -lcposix"
++fi
+
+
+
++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
++if test "${ac_cv_c_const+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-# Make sure we can run config.sub.
+-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++ /* Ultrix mips cc rejects this. */
++ typedef int charset[2];
++ const charset cs;
++ /* SunOS 4.1.1 cc rejects this. */
++ char const *const *pcpcc;
++ char **ppc;
++ /* NEC SVR4.0.2 mips cc rejects this. */
++ struct point {int x, y;};
++ static struct point const zero = {0,0};
++ /* AIX XL C 1.02.0.0 rejects this.
++ It does not let you subtract one const X* pointer from another in
++ an arm of an if-expression whose if-part is not a constant
++ expression */
++ const char *g = "string";
++ pcpcc = &g + (g ? g-g : 0);
++ /* HPUX 7.0 cc rejects these. */
++ ++pcpcc;
++ ppc = (char**) pcpcc;
++ pcpcc = (char const *const *) ppc;
++ { /* SCO 3.2v4 cc rejects this. */
++ char *t;
++ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; 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"`
+-test "x$ac_build_alias" = x &&
+- 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
++ *t++ = 0;
++ if (s) return 0;
++ }
++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
++ int x[] = {25, 17};
++ const int *foo = &x[0];
++ ++foo;
++ }
++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++ typedef const int *iptr;
++ iptr p = 0;
++ ++p;
++ }
++ { /* AIX XL C 1.02.0.0 rejects this saying
++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++ struct s { int j; const int *ap[3]; };
++ struct s *b; b->j = 5;
++ }
++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++ const int foo = 10;
++ if (!foo) return 0;
++ }
++ return !cs[0] && !zero.x;
++#endif
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
+-case $ac_cv_build in
+-*-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-build=$ac_cv_build
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_build
+-shift
+-build_cpu=$1
+-build_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-build_os=$*
+-IFS=$ac_save_IFS
+-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_c_const=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_c_const=no
++fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test "x$host_alias" = x; then
+- ac_cv_host=$ac_cv_build
+-else
+- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6; }
++if test $ac_cv_c_const = no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define const
++_ACEOF
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
+-case $ac_cv_host in
+-*-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+-esac
+-host=$ac_cv_host
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_host
+-shift
+-host_cpu=$1
+-host_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-host_os=$*
+-IFS=$ac_save_IFS
+-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-DLOPEN_LIB=''
+-ac_ext=c
+-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
+-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
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ { echo "$as_me:$LINENO: checking for signed" >&5
++echo $ECHO_N "checking for signed... $ECHO_C" >&6; }
++if test "${bh_cv_c_signed+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++int
++main ()
++{
++signed char x;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ bh_cv_c_signed=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ bh_cv_c_signed=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++{ echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
++echo "${ECHO_T}$bh_cv_c_signed" >&6; }
++ if test $bh_cv_c_signed = no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define signed
++_ACEOF
++
+ fi
+-done
+- done
+-IFS=$as_save_IFS
+
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++{ echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
++if test "${ac_cv_c_inline+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
+
+- if test "x$ac_ct_CC" = x; then
+- CC=""
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+- CC=$ac_ct_CC
+- fi
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_c_inline=$ac_kw
+ else
+- CC="$ac_cv_prog_CC"
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
+ fi
+
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ test "$ac_cv_c_inline" != no && break
+ done
+- done
+-IFS=$as_save_IFS
+
+ fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+
+
+- fi
+-fi
+-if test -z "$CC"; then
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++case $ac_cv_c_inline in
++ inline | yes) ;;
++ *)
++ case $ac_cv_c_inline in
++ no) ac_val=;;
++ *) ac_val=$ac_cv_c_inline;;
++ esac
++ cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++ ;;
++esac
++
++{ echo "$as_me:$LINENO: checking for off_t" >&5
++echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_off_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++typedef off_t ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_off_t=yes
+ else
+- ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+- ac_prog_rejected=yes
+- continue
+- fi
+- ac_cv_prog_CC="cc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-if test $ac_prog_rejected = yes; then
+- # We found a bogon in the path, so make sure we never use it.
+- set dummy $ac_cv_prog_CC
+- shift
+- if test $# != 0; then
+- # We chose a different compiler from the bogus one.
+- # However, it has the same basename, so the bogon will be chosen
+- # first if we set CC to just the basename; use the full file name.
+- shift
+- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+- fi
+-fi
++ ac_cv_type_off_t=no
+ fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
++if test $ac_cv_type_off_t = yes; then
++ :
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+
++cat >>confdefs.h <<_ACEOF
++#define off_t long int
++_ACEOF
+
+ fi
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl.exe
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_size_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++typedef size_t ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_size_t=yes
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_type_size_t=no
+ fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
++if test $ac_cv_type_size_t = yes; then
++ :
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
++_ACEOF
+
+- test -n "$CC" && break
+- done
+ fi
+-if test -z "$CC"; then
+- ac_ct_CC=$CC
+- for ac_prog in cl.exe
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++
++
++ { echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++long long ll = 1LL; int i = 63;
++int
++main ()
++{
++long long llmax = (long long) -1;
++ return ll << i | ll >> i | llmax / ll | llmax % ll;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_type_long_long=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_type_long_long=no
+ fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
++ if test $ac_cv_type_long_long = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_LONG 1
++_ACEOF
++
++ fi
++
++
++ { echo "$as_me:$LINENO: checking for long double" >&5
++echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
++if test "${gt_cv_c_long_double+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ if test "$GCC" = yes; then
++ gt_cv_c_long_double=yes
++ else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
++ /* The Stardent Vistra knows sizeof(long double), but does not support it. */
++ long double foo = 0.0;
++ /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
++ int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+
+- test -n "$ac_ct_CC" && break
+-done
++int
++main ()
++{
+
+- if test "x$ac_ct_CC" = x; then
+- CC=""
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+- CC=$ac_ct_CC
+- fi
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gt_cv_c_long_double=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ gt_cv_c_long_double=no
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
+ fi
++{ echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
++echo "${ECHO_T}$gt_cv_c_long_double" >&6; }
++ if test $gt_cv_c_long_double = yes; then
+
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_DOUBLE 1
++_ACEOF
++
++ fi
+
+-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
+
+-# Provide some information about the compiler.
+-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
+-for ac_option in --version -v -V -qversion; do
+- { { ac_try="$ac_compiler $ac_option >&5"
++ { echo "$as_me:$LINENO: checking for wchar_t" >&5
++echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
++if test "${gt_cv_c_wchar_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++ wchar_t foo = (wchar_t)'\0';
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+- if test -s conftest.err; then
+- sed '10a\
+-... rest of stderr output deleted ...
+- 10q' conftest.err >conftest.er1
+- cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gt_cv_c_wchar_t=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ gt_cv_c_wchar_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
++echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; }
++ if test $gt_cv_c_wchar_t = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_WCHAR_T 1
++_ACEOF
++
+ fi
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }
+-done
+
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++ { echo "$as_me:$LINENO: checking for wint_t" >&5
++echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
++if test "${gt_cv_c_wint_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdio.h>
++#include <wchar.h>
++ wint_t foo = (wchar_t)'\0';
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+-# Try to create an executable without -o first, disregard a.out.
+-# It will help us diagnose broken compilers, and finding out an intuition
+-# of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-
+-# The possible output files:
+-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+-
+-ac_rmfiles=
+-for ac_file in $ac_files
+-do
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+- esac
+-done
+-rm -f $ac_rmfiles
+-
+-if { { ac_try="$ac_link_default"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_link_default") 2>&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+- $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'.
+-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+-# in a Makefile. We should not override ac_cv_exeext if it was cached,
+-# so that the user can short-circuit this test for compilers unknown to
+-# Autoconf.
+-for ac_file in $ac_files ''
+-do
+- test -f "$ac_file" || continue
+- case $ac_file in
+- *.$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;;
+- *.* )
+- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+- then :; else
+- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- fi
+- # We set ac_cv_exeext here because the later test for it is not
+- # safe: cross compilers may not add the suffix if given an `-o'
+- # 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;;
+- esac
+-done
+-test "$ac_cv_exeext" = no && ac_cv_exeext=
+-
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gt_cv_c_wint_t=yes
+ else
+- ac_file=''
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then :
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++ gt_cv_c_wint_t=no
+ fi
+-ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { { case "(($ac_try" in
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
++echo "${ECHO_T}$gt_cv_c_wint_t" >&6; }
++ if test $gt_cv_c_wint_t = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_WINT_T 1
++_ACEOF
++
++ fi
++
++
++ { echo "$as_me:$LINENO: checking for inttypes.h" >&5
++echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
++if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <inttypes.h>
++int
++main ()
++{
++uintmax_t i = (uintmax_t) -1;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+- fi
+- fi
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ jm_ac_cv_header_inttypes_h=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ jm_ac_cv_header_inttypes_h=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+-ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5
++echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6; }
++ if test $jm_ac_cv_header_inttypes_h = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INTTYPES_H_WITH_UINTMAX 1
++_ACEOF
++
++ fi
++
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+-$as_echo_n "checking for suffix of executables... " >&6; }
+-if { { ac_try="$ac_link"
++ { echo "$as_me:$LINENO: checking for stdint.h" >&5
++echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
++if test "${jm_ac_cv_header_stdint_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <stdint.h>
++int
++main ()
++{
++uintmax_t i = (uintmax_t) -1;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_link") 2>&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then :
+- # 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
+-# `rm'.
+-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 | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- break;;
+- * ) break;;
+- esac
+-done
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ jm_ac_cv_header_stdint_h=yes
+ else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ jm_ac_cv_header_stdint_h=no
+ fi
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+-$as_echo "$ac_cv_exeext" >&6; }
+
+-rm -f conftest.$ac_ext
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+-$as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5
++echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6; }
++ if test $jm_ac_cv_header_stdint_h = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STDINT_H_WITH_UINTMAX 1
++_ACEOF
++
++ fi
++
++
++
++
++ { echo "$as_me:$LINENO: checking for intmax_t" >&5
++echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
++if test "${gt_cv_c_intmax_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++#include <stddef.h>
++#include <stdlib.h>
++#if HAVE_STDINT_H_WITH_UINTMAX
++#include <stdint.h>
++#endif
++#if HAVE_INTTYPES_H_WITH_UINTMAX
++#include <inttypes.h>
++#endif
++
+ int
+ main ()
+ {
+-
++intmax_t x = -1;
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.o conftest.obj
+-if { { ac_try="$ac_compile"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_compile") 2>&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then :
+- for ac_file in conftest.o conftest.obj conftest.*; do
+- test -f "$ac_file" || continue;
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+- break;;
+- esac
+-done
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gt_cv_c_intmax_t=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++ gt_cv_c_intmax_t=no
+ fi
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+-$as_echo "$ac_cv_objext" >&6; }
+-OBJEXT=$ac_cv_objext
+-ac_objext=$OBJEXT
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
++echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; }
++ if test $gt_cv_c_intmax_t = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_INTMAX_T 1
++_ACEOF
++
++ fi
++
++
++
++ { echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
++echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6; }
++if test "${gt_cv_func_printf_posix+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++ if test "$cross_compiling" = yes; then
++
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+- choke me
++#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
++ notposix
+ #endif
+
+- ;
+- return 0;
+-}
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_compiler_gnu=yes
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "notposix" >/dev/null 2>&1; then
++ gt_cv_func_printf_posix="guessing no"
+ else
+- ac_compiler_gnu=no
++ gt_cv_func_printf_posix="guessing yes"
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
++rm -f conftest*
++
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GCC=yes
+-else
+- GCC=
+-fi
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; 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
+- CFLAGS="-g"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-int
+-main ()
++#include <stdio.h>
++#include <string.h>
++/* The string "%2$d %1$d", with dollar characters protected from the shell's
++ dollar expansion (possibly an autoconf bug). */
++static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
++static char buf[100];
++int main ()
+ {
+-
+- ;
+- return 0;
++ sprintf (buf, format, 33, 55);
++ return (strcmp (buf, "55 33") != 0);
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_prog_cc_g=yes
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ gt_cv_func_printf_posix=yes
+ else
+- CFLAGS=""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-int
+-main ()
+-{
++( exit $ac_status )
++gt_cv_func_printf_posix=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
+
+- ;
+- return 0;
+-}
++
++
++fi
++{ echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
++echo "${ECHO_T}$gt_cv_func_printf_posix" >&6; }
++ case $gt_cv_func_printf_posix in
++ *yes)
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_POSIX_PRINTF 1
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+
++ ;;
++ esac
++
++# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
++# for constant arguments. Useless!
++{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
++echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
++if test "${ac_cv_working_alloca_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_c_werror_flag=$ac_save_c_werror_flag
+- CFLAGS="-g"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
++#include <alloca.h>
+ int
+ main ()
+ {
+-
++char *p = (char *) alloca (2 * sizeof (int));
++ if (p) return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_prog_cc_g=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_working_alloca_h=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_working_alloca_h=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_c_werror_flag=$ac_save_c_werror_flag
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
++{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
++echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
++if test $ac_cv_working_alloca_h = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_ALLOCA_H 1
++_ACEOF
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++{ echo "$as_me:$LINENO: checking for alloca" >&5
++echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
++if test "${ac_cv_func_alloca_works+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_prog_cc_c89=no
+-ac_save_CC=$CC
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+-
+-/* 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
+- as 'x'. The following induces an error, until -std is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+- inside strings and character constants. */
+-#define FOO(x) 'x'
+-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++#ifdef __GNUC__
++# define alloca __builtin_alloca
++#else
++# ifdef _MSC_VER
++# include <malloc.h>
++# define alloca _alloca
++# else
++# ifdef HAVE_ALLOCA_H
++# include <alloca.h>
++# else
++# ifdef _AIX
++ #pragma alloca
++# else
++# ifndef alloca /* predefined by HP cc +Olibcalls */
++char *alloca ();
++# endif
++# endif
++# endif
++# endif
++#endif
+
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++char *p = (char *) alloca (1);
++ if (p) return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_prog_cc_c89=$ac_arg
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_func_alloca_works=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_func_alloca_works=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext
+- test "x$ac_cv_prog_cc_c89" != "xno" && break
+-done
+-rm -f conftest.$ac_ext
+-CC=$ac_save_CC
+
+-fi
+-# AC_CACHE_VAL
+-case "x$ac_cv_prog_cc_c89" in
+- x)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
+- xno)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
+- *)
+- CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+-esac
+-if test "x$ac_cv_prog_cc_c89" != xno; then :
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
++echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
++
++if test $ac_cv_func_alloca_works = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_ALLOCA 1
++_ACEOF
++
++else
++ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
++# that cause trouble. Some versions do not even contain alloca or
++# contain a buggy version. If you still want to use their alloca,
++# use ar to extract alloca.o from them instead of compiling alloca.c.
++
++ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+-fi
++cat >>confdefs.h <<\_ACEOF
++#define C_ALLOCA 1
++_ACEOF
+
+-ac_ext=c
+-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
+
++{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
++echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
++if test "${ac_cv_os_cray+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#if defined CRAY && ! defined CRAY2
++webecray
++#else
++wenotbecray
++#endif
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "webecray" >/dev/null 2>&1; then
++ ac_cv_os_cray=yes
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ ac_cv_os_cray=no
++fi
++rm -f conftest*
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
++echo "${ECHO_T}$ac_cv_os_cray" >&6; }
++if test $ac_cv_os_cray = yes; then
++ for ac_func in _getb67 GETB67 getb67; do
++ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -3523,879 +7312,876 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char dlopen ();
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
+ int
+ main ()
+ {
+-return dlopen ();
++return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_dl_dlopen=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_var=yes"
+ else
+- ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_var=no"
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+- DLOPEN_LIB=-ldl
+-$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+
++cat >>confdefs.h <<_ACEOF
++#define CRAY_STACKSEG_END $ac_func
++_ACEOF
+
+-WITH_DIET_LIBC=
++ break
++fi
+
+-# Check whether --with-diet-libc was given.
+-if test "${with_diet_libc+set}" = set; then :
+- withval=$with_diet_libc; CC="diet cc -nostdinc"
+-WITH_DIET_LIBC=yes
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CC=$CC" >&5
+-$as_echo "CC=$CC" >&6; }
++ done
+ fi
+
+-# Check whether --with-cc was given.
+-if test "${with_cc+set}" = set; then :
+- withval=$with_cc; as_fn_error "--with-cc no longer supported; use CC= instead" "$LINENO" 5
++{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
++echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
++if test "${ac_cv_c_stack_direction+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "$cross_compiling" = yes; then
++ ac_cv_c_stack_direction=0
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++find_stack_direction ()
++{
++ static char *addr = 0;
++ auto char dummy;
++ if (addr == 0)
++ {
++ addr = &dummy;
++ return find_stack_direction ();
++ }
++ else
++ return (&dummy > addr) ? 1 : -1;
++}
++
++int
++main ()
++{
++ return find_stack_direction () < 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_c_stack_direction=1
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_c_stack_direction=-1
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+-# Check whether --with-ccopts was given.
+-if test "${with_ccopts+set}" = set; then :
+- withval=$with_ccopts; as_fn_error "--with-ccopts no longer supported; use CFLAGS= instead" "$LINENO" 5
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
++echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define STACK_DIRECTION $ac_cv_c_stack_direction
++_ACEOF
+
+
+-# Check whether --with-ldopts was given.
+-if test "${with_ldopts+set}" = set; then :
+- withval=$with_ldopts; as_fn_error "--with-ldopts no longer supported; use LDFLAGS= instead" "$LINENO" 5
+ fi
+
+-ac_ext=c
+-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
+-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
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++
++for ac_header in stdlib.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_header_compiler=no
+ fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+ fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++done
++
++
++for ac_func in getpagesize
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
++int
++main ()
++{
++return $ac_func ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_var=yes"
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ eval "$as_ac_var=no"
+ fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+- if test "x$ac_ct_CC" = x; then
+- CC=""
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- CC=$ac_ct_CC
+- fi
+-else
+- CC="$ac_cv_prog_CC"
+ fi
++done
+
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ if test "$cross_compiling" = yes; then
++ ac_cv_func_mmap_fixed_mapped=no
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++/* malloc might have been renamed as rpl_malloc. */
++#undef malloc
+
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++/* Thanks to Mike Haertel and Jim Avera for this test.
++ Here is a matrix of mmap possibilities:
++ mmap private not fixed
++ mmap private fixed at somewhere currently unmapped
++ mmap private fixed at somewhere already mapped
++ mmap shared not fixed
++ mmap shared fixed at somewhere currently unmapped
++ mmap shared fixed at somewhere already mapped
++ For private mappings, we should verify that changes cannot be read()
++ back from the file, nor mmap's back from the file at a different
++ address. (There have been systems where private was not correctly
++ implemented like the infamous i386 svr4.0, and systems where the
++ VM page cache was not coherent with the file system buffer cache
++ like early versions of FreeBSD and possibly contemporary NetBSD.)
++ For shared mappings, we should conversely verify that changes get
++ propagated back to all the places they're supposed to be.
+
++ Grep wants private fixed already mapped.
++ The main things grep needs to know about mmap are:
++ * does it exist and is it safe to write into the mmap'd area
++ * how to use it (BSD variants) */
+
+- fi
+-fi
+-if test -z "$CC"; then
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+- ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+- ac_prog_rejected=yes
+- continue
+- fi
+- ac_cv_prog_CC="cc"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++#include <fcntl.h>
++#include <sys/mman.h>
+
+-if test $ac_prog_rejected = yes; then
+- # We found a bogon in the path, so make sure we never use it.
+- set dummy $ac_cv_prog_CC
+- shift
+- if test $# != 0; then
+- # We chose a different compiler from the bogus one.
+- # However, it has the same basename, so the bogon will be chosen
+- # first if we set CC to just the basename; use the full file name.
+- shift
+- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+- fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
++char *malloc ();
++#endif
+
++/* This mess was copied from the GNU getpagesize.h. */
++#ifndef HAVE_GETPAGESIZE
++/* Assume that all systems that can run configure have sys/param.h. */
++# ifndef HAVE_SYS_PARAM_H
++# define HAVE_SYS_PARAM_H 1
++# endif
+
+-fi
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl.exe
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++# ifdef _SC_PAGESIZE
++# define getpagesize() sysconf(_SC_PAGESIZE)
++# else /* no _SC_PAGESIZE */
++# ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++# ifdef EXEC_PAGESIZE
++# define getpagesize() EXEC_PAGESIZE
++# else /* no EXEC_PAGESIZE */
++# ifdef NBPG
++# define getpagesize() NBPG * CLSIZE
++# ifndef CLSIZE
++# define CLSIZE 1
++# endif /* no CLSIZE */
++# else /* no NBPG */
++# ifdef NBPC
++# define getpagesize() NBPC
++# else /* no NBPC */
++# ifdef PAGESIZE
++# define getpagesize() PAGESIZE
++# endif /* PAGESIZE */
++# endif /* no NBPC */
++# endif /* no NBPG */
++# endif /* no EXEC_PAGESIZE */
++# else /* no HAVE_SYS_PARAM_H */
++# define getpagesize() 8192 /* punt totally */
++# endif /* no HAVE_SYS_PARAM_H */
++# endif /* no _SC_PAGESIZE */
++
++#endif /* no HAVE_GETPAGESIZE */
++
++int
++main ()
++{
++ char *data, *data2, *data3;
++ int i, pagesize;
++ int fd;
++
++ pagesize = getpagesize ();
++
++ /* First, make a file with some known garbage in it. */
++ data = (char *) malloc (pagesize);
++ if (!data)
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ *(data + i) = rand ();
++ umask (0);
++ fd = creat ("conftest.mmap", 0600);
++ if (fd < 0)
++ return 1;
++ if (write (fd, data, pagesize) != pagesize)
++ return 1;
++ close (fd);
++
++ /* Next, try to mmap the file at a fixed address which already has
++ something else allocated at it. If we can, also make sure that
++ we see the same garbage. */
++ fd = open ("conftest.mmap", O_RDWR);
++ if (fd < 0)
++ return 1;
++ data2 = (char *) malloc (2 * pagesize);
++ if (!data2)
++ return 1;
++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
++ MAP_PRIVATE | MAP_FIXED, fd, 0L))
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ if (*(data + i) != *(data2 + i))
++ return 1;
++
++ /* Finally, make sure that changes to the mapped area do not
++ percolate back to the file as seen by read(). (This is a bug on
++ some variants of i386 svr4.0.) */
++ for (i = 0; i < pagesize; ++i)
++ *(data2 + i) = *(data2 + i) + 1;
++ data3 = (char *) malloc (pagesize);
++ if (!data3)
++ return 1;
++ if (read (fd, data3, pagesize) != pagesize)
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ if (*(data + i) != *(data3 + i))
++ return 1;
++ close (fd);
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_func_mmap_fixed_mapped=yes
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++( exit $ac_status )
++ac_cv_func_mmap_fixed_mapped=no
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++
++
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
++if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_MMAP 1
++_ACEOF
+
+- test -n "$CC" && break
+- done
+ fi
+-if test -z "$CC"; then
+- ac_ct_CC=$CC
+- for ac_prog in cl.exe
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++rm -f conftest.mmap
++
++
++ { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
++echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; }
++if test "${ac_cv_gnu_library_2_1+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
++ Lucky GNU user
++ #endif
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "Lucky GNU user" >/dev/null 2>&1; then
++ ac_cv_gnu_library_2_1=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ ac_cv_gnu_library_2_1=no
+ fi
++rm -f conftest*
+
+
+- test -n "$ac_ct_CC" && break
+-done
+
+- if test "x$ac_ct_CC" = x; then
+- CC=""
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- CC=$ac_ct_CC
+- fi
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
++echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; }
+
+-fi
++ GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
+
+-# Provide some information about the compiler.
+-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
+-for ac_option in --version -v -V -qversion; do
+- { { ac_try="$ac_compiler $ac_option >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+- ac_status=$?
+- if test -s conftest.err; then
+- sed '10a\
+-... rest of stderr output deleted ...
+- 10q' conftest.err >conftest.er1
+- cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+- fi
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }
+-done
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
++echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6; }
++if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+- choke me
+-#endif
++ if test "$cross_compiling" = yes; then
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_compiler_gnu=yes
+-else
+- ac_compiler_gnu=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
++ # Guess based on the CPU.
++ case "$host_cpu" in
++ alpha* | i3456786 | m68k | s390*)
++ gt_cv_int_divbyzero_sigfpe="guessing yes";;
++ *)
++ gt_cv_int_divbyzero_sigfpe="guessing no";;
++ esac
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GCC=yes
+ else
+- GCC=
+-fi
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; 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
+- CFLAGS="-g"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_prog_cc_g=yes
+-else
+- CFLAGS=""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-int
+-main ()
+-{
++#include <stdlib.h>
++#include <signal.h>
+
+- ;
+- return 0;
++static void
++#ifdef __cplusplus
++sigfpe_handler (int sig)
++#else
++sigfpe_handler (sig) int sig;
++#endif
++{
++ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
++ exit (sig != SIGFPE);
+ }
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+
+-else
+- ac_c_werror_flag=$ac_save_c_werror_flag
+- CFLAGS="-g"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++int x = 1;
++int y = 0;
++int z;
++int nan;
+
+-int
+-main ()
++int main ()
+ {
++ signal (SIGFPE, sigfpe_handler);
++/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
++#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
++ signal (SIGTRAP, sigfpe_handler);
++#endif
++/* Linux/SPARC yields signal SIGILL. */
++#if defined (__sparc__) && defined (__linux__)
++ signal (SIGILL, sigfpe_handler);
++#endif
+
+- ;
+- return 0;
++ z = x / y;
++ nan = y / y;
++ exit (1);
+ }
++
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_prog_cc_g=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ gt_cv_int_divbyzero_sigfpe=yes
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++gt_cv_int_divbyzero_sigfpe=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_c_werror_flag=$ac_save_c_werror_flag
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
++
++
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_prog_cc_c89=no
+-ac_save_CC=$CC
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
++{ echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
++echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6; }
++ case "$gt_cv_int_divbyzero_sigfpe" in
++ *yes) value=1;;
++ *) value=0;;
++ esac
+
+-/* 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
+- as 'x'. The following induces an error, until -std is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++cat >>confdefs.h <<_ACEOF
++#define INTDIV0_RAISES_SIGFPE $value
++_ACEOF
+
+-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+- inside strings and character constants. */
+-#define FOO(x) 'x'
+-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
++
++ { echo "$as_me:$LINENO: checking for unsigned long long" >&5
++echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6; }
++if test "${ac_cv_type_unsigned_long_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++unsigned long long ull = 1ULL; int i = 63;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++unsigned long long ullmax = (unsigned long long) -1;
++ return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+ ;
+ return 0;
+ }
+ _ACEOF
+-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_prog_cc_c89=$ac_arg
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+- test "x$ac_cv_prog_cc_c89" != "xno" && break
+-done
+-rm -f conftest.$ac_ext
+-CC=$ac_save_CC
+-
+-fi
+-# AC_CACHE_VAL
+-case "x$ac_cv_prog_cc_c89" in
+- x)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
+- xno)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
+- *)
+- CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-if test "x$ac_cv_prog_cc_c89" != xno; then :
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_type_unsigned_long_long=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_type_unsigned_long_long=no
+ fi
+
+-ac_ext=c
+-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
+-
+-ac_ext=c
+-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
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+- CPP=
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-if test -z "$CPP"; then
+- if test "${ac_cv_prog_CPP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- # Double quotes because CPP needs to be expanded
+- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+- do
+- ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <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.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6; }
++ if test $ac_cv_type_unsigned_long_long = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_UNSIGNED_LONG_LONG 1
+ _ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
++ fi
+
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+- break
+-fi
+
+- done
+- ac_cv_prog_CPP=$CPP
+
+-fi
+- CPP=$ac_cv_prog_CPP
+-else
+- ac_cv_prog_CPP=$CPP
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
+-ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <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.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
++ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
++ test $ac_cv_type_unsigned_long_long = yes \
++ && ac_type='unsigned long long' \
++ || ac_type='unsigned long'
+
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
++cat >>confdefs.h <<_ACEOF
++#define uintmax_t $ac_type
+ _ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
++ else
+
+-else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
+-fi
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_UINTMAX_T 1
++_ACEOF
+
+-ac_ext=c
+-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
++ fi
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for inttypes.h" >&5
++echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
++if test "${gt_cv_header_inttypes_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -z "$GREP"; then
+- ac_path_GREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_prog in grep ggrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+-# Check for GNU ac_path_GREP and select it if it is found.
+- # Check for GNU $ac_path_GREP
+-case `"$ac_path_GREP" --version 2>&1` in
+-*GNU*)
+- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+-*)
+- ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
+- while :
+- do
+- cat "conftest.in" "conftest.in" >"conftest.tmp"
+- mv "conftest.tmp" "conftest.in"
+- cp "conftest.in" "conftest.nl"
+- $as_echo 'GREP' >> "conftest.nl"
+- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+- as_fn_arith $ac_count + 1 && ac_count=$as_val
+- if test $ac_count -gt ${ac_path_GREP_max-0}; then
+- # Best one so far, save it but keep looking for a better one
+- ac_cv_path_GREP="$ac_path_GREP"
+- ac_path_GREP_max=$ac_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test $ac_count -gt 10 && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
+
+- $ac_path_GREP_found && break 3
+- done
+- done
+- done
+-IFS=$as_save_IFS
+- if test -z "$ac_cv_path_GREP"; then
+- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+- fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <inttypes.h>
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gt_cv_header_inttypes_h=yes
+ else
+- ac_cv_path_GREP=$GREP
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ gt_cv_header_inttypes_h=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+-$as_echo "$ac_cv_path_GREP" >&6; }
+- GREP="$ac_cv_path_GREP"
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+-$as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+- then ac_cv_path_EGREP="$GREP -E"
+- else
+- if test -z "$EGREP"; then
+- ac_path_EGREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_prog in egrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+-# Check for GNU ac_path_EGREP and select it if it is found.
+- # Check for GNU $ac_path_EGREP
+-case `"$ac_path_EGREP" --version 2>&1` in
+-*GNU*)
+- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+-*)
+- ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
+- while :
+- do
+- cat "conftest.in" "conftest.in" >"conftest.tmp"
+- mv "conftest.tmp" "conftest.in"
+- cp "conftest.in" "conftest.nl"
+- $as_echo 'EGREP' >> "conftest.nl"
+- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+- as_fn_arith $ac_count + 1 && ac_count=$as_val
+- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+- # Best one so far, save it but keep looking for a better one
+- ac_cv_path_EGREP="$ac_path_EGREP"
+- ac_path_EGREP_max=$ac_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test $ac_count -gt 10 && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
++fi
++{ echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
++echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6; }
++ if test $gt_cv_header_inttypes_h = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INTTYPES_H 1
++_ACEOF
+
+- $ac_path_EGREP_found && break 3
+- done
+- done
+- done
+-IFS=$as_save_IFS
+- if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+-else
+- ac_cv_path_EGREP=$EGREP
+-fi
+
+- 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"
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ if test $gt_cv_header_inttypes_h = yes; then
++ { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
++echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; }
++if test "${gt_cv_inttypes_pri_broken+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
++#include <inttypes.h>
++#ifdef PRId32
++char *p = PRId32;
++#endif
+
+ int
+ main ()
+@@ -4405,847 +8191,1511 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_header_stdc=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ gt_cv_inttypes_pri_broken=no
+ else
+- ac_cv_header_stdc=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ gt_cv_inttypes_pri_broken=yes
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-if test $ac_cv_header_stdc = yes; then
+- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <string.h>
++fi
++{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
++echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; }
++ fi
++ if test "$gt_cv_inttypes_pri_broken" = yes; then
+
++cat >>confdefs.h <<_ACEOF
++#define PRI_MACROS_BROKEN 1
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "memchr" >/dev/null 2>&1; then :
+
+-else
+- ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
++ fi
+
+-fi
+
+-if test $ac_cv_header_stdc = yes; then
+- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <stdlib.h>
+
++for ac_header in stdint.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "free" >/dev/null 2>&1; then :
+-
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
+ else
+- ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_header_compiler=no
+ fi
+
+-if test $ac_cv_header_stdc = yes; then
+- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+- if test "$cross_compiling" = yes; then :
+- :
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ctype.h>
+-#include <stdlib.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+- (('a' <= (c) && (c) <= 'i') \
+- || ('j' <= (c) && (c) <= 'r') \
+- || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+- int i;
+- for (i = 0; i < 256; i++)
+- if (XOR (islower (i), ISLOWER (i))
+- || toupper (i) != TOUPPER (i))
+- return 2;
+- return 0;
+-}
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
+- ac_cv_header_stdc=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_header_preproc=no
+ fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+
+-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- 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
+-"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
++ { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
++echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; }
++ result=
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-ac_fn_c_check_header_mongrel "$LINENO" "linux/fs.h" "ac_cv_header_linux_fs_h" "$ac_includes_default"
+-if test "x$ac_cv_header_linux_fs_h" = x""yes; then :
+- linux_headers=yes
+-else
+- linux_headers=no
++#include <limits.h>
++#if HAVE_STDINT_H
++#include <stdint.h>
++#endif
++#ifdef SIZE_MAX
++Found it
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "Found it" >/dev/null 2>&1; then
++ result=yes
+ fi
++rm -f conftest*
+
++ if test -z "$result"; then
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
++test_array [0] = 0
+
+-if test "$linux_headers" != yes; then
+- LINUX_INCLUDE='-I$(top_builddir)/include'
+-fi
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
++test_array [0] = 0
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional special compiler flags" >&5
+-$as_echo_n "checking for additional special compiler flags... " >&6; }
+-if test "$GCC" = yes
+-then
+- case "$host_cpu" in
+- alpha) addcflags="-mieee" ;;
+- esac
+-fi
+-if test "x$addcflags" != x
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $addcflags" >&5
+-$as_echo "$addcflags" >&6; }
+- CFLAGS="$addcflags $CFLAGS"
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+-$as_echo "(none)" >&6; }
+-fi
+-LIB_EXT=.a
+-STATIC_LIB_EXT=.a
+-PROFILED_LIB_EXT=.a
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-# Check whether --with-root-prefix was given.
+-if test "${with_root_prefix+set}" = set; then :
+- withval=$with_root_prefix; root_prefix=$withval
+-else
+- root_prefix=NONE
+-fi
+-# Check whether --enable-maintainer-mode was given.
+-if test "${enable_maintainer_mode+set}" = set; then :
+- enableval=$enable_maintainer_mode; if test "$enableval" = "no"
+-then
+- MAINTAINER_CMT=#
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling maintainer mode" >&5
+-$as_echo "Disabling maintainer mode" >&6; }
+-else
+- MAINTAINER_CMT=
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling maintainer mode" >&5
+-$as_echo "Enabling maintainer mode" >&6; }
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- MAINTAINER_CMT=#
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling maintainer mode by default" >&5
+-$as_echo "Disabling maintainer mode by default" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
++test_array [0] = 0
+
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
++test_array [0] = 0
+
+-# Check whether --enable-verbose-makecmds was given.
+-if test "${enable_verbose_makecmds+set}" = set; then :
+- enableval=$enable_verbose_makecmds; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling verbose make commands" >&5
+-$as_echo "Disabling verbose make commands" >&6; }
+- E=@echo
+- Q=@
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling verbose make commands" >&5
+-$as_echo "Enabling verbose make commands" >&6; }
+- E=@\\#
+- Q=
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling verbose make commands" >&5
+-$as_echo "Disabling verbose make commands" >&6; }
+-E=@echo
+-Q=@
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo= ac_hi=
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
++test_array [0] = 0
+
+-# Check whether --enable-compression was given.
+-if test "${enable_compression+set}" = set; then :
+- enableval=$enable_compression; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support" >&5
+-$as_echo "Disabling compression support" >&6; }
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
+ else
+- $as_echo "#define ENABLE_COMPRESSION 1" >>confdefs.h
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling compression support" >&5
+-$as_echo "Enabling compression support" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compression support is experimental" >&5
+-$as_echo "$as_me: WARNING: Compression support is experimental" >&2;}
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) res_hi=$ac_lo;;
++'') result=? ;;
++esac
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support by default" >&5
+-$as_echo "Disabling compression support by default" >&6; }
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++static long int longval () { return ~(size_t)0 / 10; }
++static unsigned long int ulongval () { return ~(size_t)0 / 10; }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
+-fi
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if ((~(size_t)0 / 10) < 0)
++ {
++ long int i = longval ();
++ if (i != (~(size_t)0 / 10))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != (~(size_t)0 / 10))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
+
+-# Check whether --enable-htree was given.
+-if test "${enable_htree+set}" = set; then :
+- enableval=$enable_htree; if test "$enableval" = "no"
+-then
+- HTREE_CMT=#
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling htree directory support" >&5
+-$as_echo "Disabling htree directory support" >&6; }
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ res_hi=`cat conftest.val`
+ else
+- HTREE_CMT=
+- $as_echo "#define ENABLE_HTREE 1" >>confdefs.h
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling htree directory support" >&5
+-$as_echo "Enabling htree directory support" >&6; }
++( exit $ac_status )
++result=?
+ fi
+-
+-else
+- HTREE_CMT=
+-$as_echo "#define ENABLE_HTREE 1" >>confdefs.h
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling htree directory support by default" >&5
+-$as_echo "Enabling htree directory support by default" >&6; }
+-
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++rm -f conftest.val
+
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
++test_array [0] = 0
+
+-E2_PKG_CONFIG_STATIC=--static
+-LDFLAG_DYNAMIC=
+-PRIVATE_LIBS_CMT=
+-# Check whether --enable-elf-shlibs was given.
+-if test "${enable_elf_shlibs+set}" = set; then :
+- enableval=$enable_elf_shlibs; if test "$enableval" = "no"
+-then
+- ELF_CMT=#
+- MAKEFILE_ELF=/dev/null
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling ELF shared libraries" >&5
+-$as_echo "Disabling ELF shared libraries" >&6; }
+-else
+- E2_PKG_CONFIG_STATIC=
+- ELF_CMT=
+- MAKEFILE_ELF=$srcdir/lib/Makefile.elf-lib
+- case "$host_os" in
+- solaris2.*)
+- MAKEFILE_ELF=$srcdir/lib/Makefile.solaris-lib
+- ;;
+- esac
+- BINARY_TYPE=elfbin
+- LIB_EXT=.so
+- PRIVATE_LIBS_CMT=#
+- LDFLAG_DYNAMIC='-Wl,-rpath-link,$(top_builddir)/lib'
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling ELF shared libraries" >&5
+-$as_echo "Enabling ELF shared libraries" >&6; }
+-fi
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
++test_array [0] = 0
+
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
+ else
+- MAKEFILE_ELF=/dev/null
+-ELF_CMT=#
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling ELF shared libraries by default" >&5
+-$as_echo "Disabling ELF shared libraries by default" >&6; }
+-
+-fi
+-
+-
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-# Check whether --enable-bsd-shlibs was given.
+-if test "${enable_bsd_shlibs+set}" = set; then :
+- enableval=$enable_bsd_shlibs; if test "$enableval" = "no"
+-then
+- BSDLIB_CMT=#
+- MAKEFILE_BSDLIB=/dev/null
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling BSD shared libraries" >&5
+-$as_echo "Disabling BSD shared libraries" >&6; }
+-else
+- E2_PKG_CONFIG_STATIC=
+- BSDLIB_CMT=
+- MAKEFILE_BSDLIB=$srcdir/lib/Makefile.bsd-lib
+- LIB_EXT=.so
+- case "$host_os" in
+- darwin*)
+- MAKEFILE_BSDLIB=$srcdir/lib/Makefile.darwin-lib
+- LIB_EXT=.dylib
+- ;;
+- esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling BSD shared libraries" >&5
+-$as_echo "Enabling BSD shared libraries" >&6; }
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- MAKEFILE_BSDLIB=/dev/null
+-BSDLIB_CMT=#
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling BSD shared libraries by default" >&5
+-$as_echo "Disabling BSD shared libraries by default" >&6; }
+-
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
++test_array [0] = 0
+
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
++test_array [0] = 0
+
+-# Check whether --enable-profile was given.
+-if test "${enable_profile+set}" = set; then :
+- enableval=$enable_profile; if test "$enableval" = "no"
+-then
+- PROFILE_CMT=#
+- MAKEFILE_PROFILE=/dev/null
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling profiling libraries" >&5
+-$as_echo "Disabling profiling libraries" >&6; }
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
+ else
+- PROFILE_CMT=
+- MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
+- PROFILED_LIB_EXT=_p.a
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building profiling libraries" >&5
+-$as_echo "Building profiling libraries" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- PROFILE_CMT=#
+-MAKEFILE_PROFILE=/dev/null
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling profiling libraries by default" >&5
+-$as_echo "Disabling profiling libraries by default" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo= ac_hi=
+ fi
+
+-
+-
+-# Check whether --enable-checker was given.
+-if test "${enable_checker+set}" = set; then :
+- enableval=$enable_checker; if test "$enableval" = "no"
+-then
+- CHECKER_CMT=#
+- MAKEFILE_CHECKER=/dev/null
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling checker libraries" >&5
+-$as_echo "Disabling checker libraries" >&6; }
+-else
+- CHECKER_CMT=
+- MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building checker libraries" >&5
+-$as_echo "Building checker libraries" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
+ else
+- CHECKER_CMT=#
+-MAKEFILE_CHECKER=/dev/null
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling checker libraries by default" >&5
+-$as_echo "Disabling checker libraries by default" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) res_lo=$ac_lo;;
++'') result=? ;;
++esac
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++static long int longval () { return ~(size_t)0 % 10; }
++static unsigned long int ulongval () { return ~(size_t)0 % 10; }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if ((~(size_t)0 % 10) < 0)
++ {
++ long int i = longval ();
++ if (i != (~(size_t)0 % 10))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != (~(size_t)0 % 10))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
+
+-
+-
+-
+-
+-
+-# Check whether --enable-jbd-debug was given.
+-if test "${enable_jbd_debug+set}" = set; then :
+- enableval=$enable_jbd_debug; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling journal debugging" >&5
+-$as_echo "Disabling journal debugging" >&6; }
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ res_lo=`cat conftest.val`
+ else
+- $as_echo "#define CONFIG_JBD_DEBUG 1" >>confdefs.h
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling journal debugging" >&5
+-$as_echo "Enabling journal debugging" >&6; }
++( exit $ac_status )
++result=?
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++rm -f conftest.val
+
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling journal debugging by default" >&5
+-$as_echo "Disabling journal debugging by default" >&6; }
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
++test_array [0] = 0
+
+-fi
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
++test_array [0] = 0
+
+-# Check whether --enable-blkid-debug was given.
+-if test "${enable_blkid_debug+set}" = set; then :
+- enableval=$enable_blkid_debug; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling blkid debugging" >&5
+-$as_echo "Disabling blkid debugging" >&6; }
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
+ else
+- $as_echo "#define CONFIG_BLKID_DEBUG 1" >>confdefs.h
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling blkid debugging" >&5
+-$as_echo "Enabling blkid debugging" >&6; }
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling blkid debugging by default" >&5
+-$as_echo "Disabling blkid debugging by default" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
++test_array [0] = 0
+
+-# Check whether --enable-testio-debug was given.
+-if test "${enable_testio_debug+set}" = set; then :
+- enableval=$enable_testio_debug; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling testio debugging" >&5
+-$as_echo "Disabling testio debugging" >&6; }
+- TEST_IO_CMT="#"
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
+ else
+- TEST_IO_CMT=
+- $as_echo "#define CONFIG_TESTIO_DEBUG 1" >>confdefs.h
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling testio debugging" >&5
+-$as_echo "Enabling testio debugging" >&6; }
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling testio debugging by default" >&5
+-$as_echo "Enabling testio debugging by default" >&6; }
+-$as_echo "#define CONFIG_TESTIO_DEBUG 1" >>confdefs.h
+-
+-TEST_IO_CMT=
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo= ac_hi=
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++int
++main ()
++{
++static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
++test_array [0] = 0
+
+-
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- ;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+- ac_pt_PKG_CONFIG=$PKG_CONFIG
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $ac_pt_PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+
+- ;;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) fits_in_uint=$ac_lo;;
++'') result=? ;;
+ esac
+-fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+-if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stddef.h>
++static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
++static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
+- if test "x$ac_pt_PKG_CONFIG" = x; then
+- PKG_CONFIG=""
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
++ {
++ long int i = longval ();
++ if (i != (sizeof (size_t) <= sizeof (unsigned int)))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
+ else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
++ {
++ unsigned long int i = ulongval ();
++ if (i != (sizeof (size_t) <= sizeof (unsigned int)))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+- PKG_CONFIG=$ac_pt_PKG_CONFIG
+- fi
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ fits_in_uint=`cat conftest.val`
+ else
+- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+-fi
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++( exit $ac_status )
++result=?
+ fi
+-if test -n "$PKG_CONFIG"; then
+- _pkg_min_version=0.9.0
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- PKG_CONFIG=""
+- fi
+-
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-LIBUUID=
+-DEPLIBUUID=
+-STATIC_LIBUUID=
+-DEPSTATIC_LIBUUID=
+-PROFILED_LIBUUID=
+-DEPPROFILED_LIBUUID=
+-UUID_CMT=
+-# Check whether --enable-libuuid was given.
+-if test "${enable_libuuid+set}" = set; then :
+- enableval=$enable_libuuid; if test "$enableval" = "no"
+-then
+- if test -z "$PKG_CONFIG"; then
+- as_fn_error "pkg-config not installed; please install it." "$LINENO" 5
+- fi
++rm -f conftest.val
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+-$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-luuid $LIBUUID $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if test "$fits_in_uint" = 1; then
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++#include <stddef.h>
++ extern size_t foo;
++ extern unsigned long foo;
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char uuid_generate ();
+ int
+ main ()
+ {
+-return uuid_generate ();
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_uuid_uuid_generate=yes
+-else
+- ac_cv_lib_uuid_uuid_generate=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+-$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+-if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
+- LIBUUID=`$PKG_CONFIG --libs uuid`;
+- STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`
+-else
+- as_fn_error "external uuid library not found" "$LINENO" 5
+-fi
+-
+- UUID_CMT=#
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private uuid library" >&5
+-$as_echo "Disabling private uuid library" >&6; }
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ fits_in_uint=0
+ else
+- LIBUUID='$(LIB)/libuuid'$LIB_EXT
+- DEPLIBUUID=$LIBUUID
+- STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+- DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+- PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+- DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private uuid library" >&5
+-$as_echo "Enabling private uuid library" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-else
+- LIBUUID='$(LIB)/libuuid'$LIB_EXT
+-DEPLIBUUID=$LIBUUID
+-STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+-DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+-PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+-DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private uuid library by default" >&5
+-$as_echo "Enabling private uuid library by default" >&6; }
+
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
++ if test -z "$result"; then
++ if test "$fits_in_uint" = 1; then
++ result="$res_hi$res_lo"U
++ else
++ result="$res_hi$res_lo"UL
++ fi
++ else
++ result='~(size_t)0'
++ fi
++ fi
++ { echo "$as_me:$LINENO: result: $result" >&5
++echo "${ECHO_T}$result" >&6; }
++ if test "$result" != yes; then
+
++cat >>confdefs.h <<_ACEOF
++#define SIZE_MAX $result
++_ACEOF
+
++ fi
+
+
+
+
++for ac_header in stdint.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_header_compiler=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- ;;
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
+ fi
+
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+-fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+- ac_pt_PKG_CONFIG=$PKG_CONFIG
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $ac_pt_PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+- ;;
++ ;;
+ esac
+-fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+-if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+- if test "x$ac_pt_PKG_CONFIG" = x; then
+- PKG_CONFIG=""
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++
++ if test "X$prefix" = "XNONE"; then
++ acl_final_prefix="$ac_default_prefix"
+ else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- PKG_CONFIG=$ac_pt_PKG_CONFIG
++ acl_final_prefix="$prefix"
++ fi
++ if test "X$exec_prefix" = "XNONE"; then
++ acl_final_exec_prefix='${prefix}'
++ else
++ acl_final_exec_prefix="$exec_prefix"
+ fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
++ prefix="$acl_save_prefix"
++
++
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++ with_gnu_ld=no
+ fi
+
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+-if test -n "$PKG_CONFIG"; then
+- _pkg_min_version=0.9.0
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- PKG_CONFIG=""
+- fi
+-
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
++echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [\\/]* | [A-Za-z]:[\\/]*)
++ re_direlt='/[^/][^/]*/\.\./'
++ # Canonicalize the path of ld
++ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
++ ;;
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
++ ;;
++ esac
++elif test "$with_gnu_ld" = yes; then
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
++else
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+-LIBBLKID=
+-DEPLIBBLKID=
+-STATIC_LIBBLKID=
+-DEPSTATIC_LIBBLKID=
+-PROFILED_LIBBLKID=
+-DEPPROFILED_LIBBLKID=
+-BLKID_CMT=
+-# Check whether --enable-libblkid was given.
+-if test "${enable_libblkid+set}" = set; then :
+- enableval=$enable_libblkid; if test "$enableval" = "no"
+-then
+- if test -z "$PKG_CONFIG"; then
+- as_fn_error "pkg-config not installed; please install it." "$LINENO" 5
+- fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blkid_get_cache in -lblkid" >&5
+-$as_echo_n "checking for blkid_get_cache in -lblkid... " >&6; }
+-if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++if test "${acl_cv_path_LD+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lblkid $LIBBLKID $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char blkid_get_cache ();
+-int
+-main ()
+-{
+-return blkid_get_cache ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_blkid_blkid_get_cache=yes
++ if test -z "$LD"; then
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++ acl_cv_path_LD="$ac_dir/$ac_prog"
++ # Check to see if the program is GNU ld. I'd rather use --version,
++ # but apparently some GNU ld's only accept -v.
++ # Break only if it was the GNU/non-GNU ld that we prefer.
++ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
++ *GNU* | *'with BFD'*)
++ test "$with_gnu_ld" != no && break ;;
++ *)
++ test "$with_gnu_ld" != yes && break ;;
++ esac
++ fi
++ done
++ IFS="$ac_save_ifs"
+ else
+- ac_cv_lib_blkid_blkid_get_cache=no
++ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
+-$as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
+-if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then :
+- LIBBLKID=`$PKG_CONFIG --libs blkid`;
+- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
++
++LD="$acl_cv_path_LD"
++if test -n "$LD"; then
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- as_fn_error "external blkid library not found" "$LINENO" 5
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-
+- BLKID_CMT=#
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private blkid library" >&5
+-$as_echo "Disabling private blkid library" >&6; }
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++ { (exit 1); exit 1; }; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
++if test "${acl_cv_prog_gnu_ld+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- LIBBLKID='$(LIB)/libblkid'$LIB_EXT
+- DEPLIBBLKID=$LIBBLKID
+- STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
+- DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
+- PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
+- DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
+- $as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library" >&5
+-$as_echo "Enabling private blkid library" >&6; }
++ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++ acl_cv_prog_gnu_ld=yes ;;
++*)
++ acl_cv_prog_gnu_ld=no ;;
++esac
+ fi
++{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
++with_gnu_ld=$acl_cv_prog_gnu_ld
++
+
++
++ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
++echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
++if test "${acl_cv_rpath+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- LIBBLKID='$(LIB)/libblkid'$LIB_EXT
+-DEPLIBBLKID=$LIBBLKID
+-STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
+-DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
+-PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
+-DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
+-$as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library by default" >&5
+-$as_echo "Enabling private blkid library by default" >&6; }
++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++ . ./conftest.sh
++ rm -f ./conftest.sh
++ acl_cv_rpath=done
+
+ fi
++{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
++echo "${ECHO_T}$acl_cv_rpath" >&6; }
++ wl="$acl_cv_wl"
++ libext="$acl_cv_libext"
++ shlibext="$acl_cv_shlibext"
++ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ hardcode_direct="$acl_cv_hardcode_direct"
++ hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ # Check whether --enable-rpath was given.
++if test "${enable_rpath+set}" = set; then
++ enableval=$enable_rpath; :
++else
++ enable_rpath=yes
++fi
+
+
+
+@@ -5254,1073 +9704,1260 @@ fi
+
+
+
+-# Check whether --enable-debugfs was given.
+-if test "${enable_debugfs+set}" = set; then :
+- enableval=$enable_debugfs; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling debugfs support" >&5
+-$as_echo "Disabling debugfs support" >&6; }
+- DEBUGFS_CMT="#"
+-else
+- DEBUGFS_CMT=
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling debugfs support" >&5
+-$as_echo "Enabling debugfs support" >&6; }
+-fi
++ use_additional=yes
+
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling debugfs support by default" >&5
+-$as_echo "Enabling debugfs support by default" >&6; }
+-DEBUGFS_CMT=
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
+
+-fi
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
+
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-# Check whether --enable-imager was given.
+-if test "${enable_imager+set}" = set; then :
+- enableval=$enable_imager; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling e2image support" >&5
+-$as_echo "Disabling e2image support" >&6; }
+- IMAGER_CMT="#"
+-else
+- IMAGER_CMT=
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2image support" >&5
+-$as_echo "Enabling e2image support" >&6; }
+-fi
+
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2image support by default" >&5
+-$as_echo "Enabling e2image support by default" >&6; }
+-IMAGER_CMT=
++# Check whether --with-libiconv-prefix was given.
++if test "${with_libiconv_prefix+set}" = set; then
++ withval=$with_libiconv_prefix;
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
+
+-fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
+
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
+
+-# Check whether --enable-resizer was given.
+-if test "${enable_resizer+set}" = set; then :
+- enableval=$enable_resizer; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling e2resize support" >&5
+-$as_echo "Disabling e2resize support" >&6; }
+- RESIZER_CMT="#"
+-else
+- RESIZER_CMT=
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2resize support" >&5
+-$as_echo "Enabling e2resize support" >&6; }
+ fi
+
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2resize support by default" >&5
+-$as_echo "Enabling e2resize support by default" >&6; }
+-RESIZER_CMT=
++ LIBICONV=
++ LTLIBICONV=
++ INCICONV=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='iconv '
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
++ else
++ :
++ fi
++ else
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ if test $use_additional = yes; then
++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
++ found_dir="$additional_libdir"
++ found_so="$additional_libdir/lib$name.$shlibext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ else
++ if test -f "$additional_libdir/lib$name.$libext"; then
++ found_dir="$additional_libdir"
++ found_a="$additional_libdir/lib$name.$libext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIBICONV; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-fi
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
++ found_dir="$dir"
++ found_so="$dir/lib$name.$shlibext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ else
++ if test -f "$dir/lib$name.$libext"; then
++ found_dir="$dir"
++ found_a="$dir/lib$name.$libext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ else
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ if test "$hardcode_direct" = yes; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ else
++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ haveit=
++ for x in $LDFLAGS $LIBICONV; do
+
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-# Check whether --enable-fsck was given.
+-if test "${enable_fsck+set}" = set; then :
+- enableval=$enable_fsck; if test "$enableval" = "no"
+-then
+- FSCK_PROG='' FSCK_MAN=''
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building fsck wrapper" >&5
+-$as_echo "Not building fsck wrapper" >&6; }
+-else
+- FSCK_PROG=fsck FSCK_MAN=fsck.8
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building fsck wrapper" >&5
+-$as_echo "Building fsck wrapper" >&6; }
+-fi
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
++ fi
++ if test "$hardcode_minus_L" != no; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ else
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
++ else
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
++ fi
++ fi
++ additional_includedir=
++ case "$found_dir" in
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INCICONV; do
+
+-else
+- case "$host_os" in
+- gnu*)
+- FSCK_PROG='' FSCK_MAN=''
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building fsck wrapper by default" >&5
+-$as_echo "Not building fsck wrapper by default" >&6; }
+- ;;
+- *)
+- FSCK_PROG=fsck FSCK_MAN=fsck.8
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building fsck wrapper by default" >&5
+-$as_echo "Building fsck wrapper by default" >&6; }
+-esac
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-fi
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test -n "$found_la"; then
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIBICONV; do
+
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
++ for x in $LDFLAGS $LTLIBICONV; do
+
+-# Check whether --enable-e2initrd-helper was given.
+-if test "${enable_e2initrd_helper+set}" = set; then :
+- enableval=$enable_e2initrd_helper; if test "$enableval" = "no"
+-then
+- E2INITRD_PROG='' E2INITRD_MAN=''
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building e2initrd helper" >&5
+-$as_echo "Not building e2initrd helper" >&6; }
+-else
+- E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building e2initrd helper" >&5
+-$as_echo "Building e2initrd helper" >&6; }
+-fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-else
+- E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building e2initrd helper by default" >&5
+-$as_echo "Building e2initrd helper by default" >&6; }
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ ;;
++ -R*)
++ dir=`echo "X$dep" | sed -e 's/^X-R//'`
++ if test "$enable_rpath" != no; then
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $dir"
++ fi
++ fi
++ ;;
++ -l*)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
++ ;;
++ *.la)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
++ ;;
++ *)
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
++ ;;
++ esac
++ done
++ fi
++ else
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
++ fi
++ fi
++ fi
++ done
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n "$hardcode_libdir_separator"; then
++ alldirs=
++ for found_dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ done
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
++ else
++ for found_dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$found_dir"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
++ done
++ fi
++ fi
++ if test "X$ltrpathdirs" != "X"; then
++ for found_dir in $ltrpathdirs; do
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
++ done
++ fi
+
+-fi
+
+
+
+-# Check whether --enable-tls was given.
+-if test "${enable_tls+set}" = set; then :
+- enableval=$enable_tls; if test "$enableval" = "no"
+-then
+- try_tls=""
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling thread local support" >&5
+-$as_echo "Disabling thread local support" >&6; }
+-else
+- try_tls="yes"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling thread local support" >&5
+-$as_echo "Enabling thread local support" >&6; }
+-fi
+
+-else
+- if test -n "$WITH_DIET_LIBC"
+-then
+- try_tls=""
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Diet libc does not support thread local support" >&5
+-$as_echo "Diet libc does not support thread local support" >&6; }
+-else
+- try_tls="yes"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Try using thread local support by default" >&5
+-$as_echo "Try using thread local support by default" >&6; }
+-fi
+
+-fi
+
+-if test "$try_tls" = "yes"
+-then
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread local storage (TLS) class" >&5
+-$as_echo_n "checking for thread local storage (TLS) class... " >&6; }
+- if test "${ac_cv_tls+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
++echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_ptrdiff_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-
+- ax_tls_keywords="__thread __declspec(thread) none"
+- for ax_tls_keyword in $ax_tls_keywords; do
+- case $ax_tls_keyword in
+- none) ac_cv_tls=none ; break ;;
+- *)
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdlib.h>
+- static void
+- foo(void) {
+- static $ax_tls_keyword int bar;
+- exit(1);
+- }
++$ac_includes_default
++typedef ptrdiff_t ac__type_new_;
+ int
+ main ()
+ {
+-
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_tls=$ax_tls_keyword ; break
+-else
+- ac_cv_tls=none
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- esac
+- done
+-
+-fi
+-
+-
+- if test "$ac_cv_tls" != "none"; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define TLS $ac_cv_tls
+-_ACEOF
+-
+- fi
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
+-$as_echo "$ac_cv_tls" >&6; }
+-
+-fi
+-# Check whether --enable-uuidd was given.
+-if test "${enable_uuidd+set}" = set; then :
+- enableval=$enable_uuidd; if test "$enableval" = "no"
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building uuidd" >&5
+-$as_echo "Not building uuidd" >&6; }
+- UUIDD_CMT="#"
+-else
+- $as_echo "#define USE_UUIDD 1" >>confdefs.h
+-
+- UUIDD_CMT=""
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building uuidd" >&5
+-$as_echo "Building uuidd" >&6; }
+-fi
+-
+-else
+- $as_echo "#define USE_UUIDD 1" >>confdefs.h
+-
+-UUIDD_CMT=""
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building uuidd by default" >&5
+-$as_echo "Building uuidd by default" >&6; }
+-
+-fi
+-
+-
+-MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
+-
+-GETTEXT_PACKAGE=e2fsprogs
+-PACKAGE=e2fsprogs
+-VERSION="$E2FSPROGS_VERSION"
+-VERSION=0.14.1
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE "$PACKAGE"
+-_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
+-#define VERSION "$VERSION"
+-_ACEOF
+-
+-
+-
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+-set x ${MAKE-make}
+-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.make <<\_ACEOF
+-SHELL = /bin/sh
+-all:
+- @echo '@@@%%%=$(MAKE)=@@@%%%'
+-_ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-case `${MAKE-make} -f conftest.make 2>/dev/null` in
+- *@@@%%%=?*=@@@%%%*)
+- eval ac_cv_prog_make_${ac_make}_set=yes;;
+- *)
+- eval ac_cv_prog_make_${ac_make}_set=no;;
+-esac
+-rm -f conftest.make
+-fi
+-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- SET_MAKE=
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- SET_MAKE="MAKE=${MAKE-make}"
+-fi
+-
+-# Find a good install program. We prefer a C program (faster),
+-# so one script is as good as another. But avoid the broken or
+-# incompatible versions:
+-# SysV /etc/install, /usr/sbin/install
+-# SunOS /usr/etc/install
+-# IRIX /sbin/install
+-# AIX /bin/install
+-# AmigaOS /C/install, which installs bootblocks on floppy discs
+-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+-# 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.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+-if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in #((
+- ./ | .// | /[cC]/* | \
+- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+- /usr/ucb/* ) ;;
+- *)
+- # OSF1 and SCO ODT 3.0 have their own names for install.
+- # Don't use installbsd from OSF since it installs stuff as root
+- # by default.
+- for ac_prog in ginstall scoinst install; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- 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.
+- :
+- 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
+- mkdir conftest.dir
+- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+- test -s conftest.one && test -s conftest.two &&
+- test -s conftest.dir/conftest.one &&
+- test -s conftest.dir/conftest.two
+- then
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
+- fi
+- fi
+- fi
+- done
+- done
+- ;;
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-
+- done
+-IFS=$as_save_IFS
+-
+-rm -rf conftest.one conftest.two conftest.dir
+-
+-fi
+- if test "${ac_cv_path_install+set}" = set; then
+- INSTALL=$ac_cv_path_install
+- else
+- # As a last resort, use the slow shell script. Don't cache a
+- # value for INSTALL within a source directory, because that will
+- # break other packages using the cache if that directory is
+- # removed, or if the value is a relative name.
+- INSTALL=$ac_install_sh
+- fi
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_ptrdiff_t=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_type_ptrdiff_t=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
+
+-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+-# It thinks the first close brace ends the variable substitution.
+-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
++echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
++if test $ac_cv_type_ptrdiff_t = yes; then
++ :
++else
+
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++cat >>confdefs.h <<\_ACEOF
++#define ptrdiff_t long
++_ACEOF
+
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
++fi
+
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- case "$ac_aux_dir" in
+- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+- esac
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+-$as_echo_n "checking whether NLS is requested... " >&6; }
+- # Check whether --enable-nls was given.
+-if test "${enable_nls+set}" = set; then :
+- enableval=$enable_nls; USE_NLS=$enableval
+-else
+- USE_NLS=yes
+-fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+-$as_echo "$USE_NLS" >&6; }
+
+
+
+
+
+
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
++for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
++stdlib.h string.h unistd.h sys/param.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
+ fi
+
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- ac_executable_p="test -x"
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
+- ac_executable_p="test -f"
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
+ fi
+-rm -f conf$$.file
+
+-# Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case "$MSGFMT" in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
+ ;;
+- *)
+- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$ac_save_IFS"
+- test -z "$ac_dir" && ac_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+- if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+- break 2
+- fi
+- fi
+- done
+- done
+- IFS="$ac_save_IFS"
+- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
+ ;;
+ esac
+-fi
+-MSGFMT="$ac_cv_path_MSGFMT"
+-if test "$MSGFMT" != ":"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+-$as_echo "$MSGFMT" >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+- # Extract the first word of "gmsgfmt", so it can be a program name with args.
+-set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $GMSGFMT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+- ;;
+-esac
+ fi
+-GMSGFMT=$ac_cv_path_GMSGFMT
+-if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+-$as_echo "$GMSGFMT" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+
++done
+
+
+
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
+-fi
+
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- ac_executable_p="test -x"
+-else
+- ac_executable_p="test -f"
+-fi
+-rm -f conf$$.file
+
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
++mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
++strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
++__fsetlocking
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case "$XGETTEXT" in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+- ;;
+- *)
+- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$ac_save_IFS"
+- test -z "$ac_dir" && ac_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+- if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+- break 2
+- fi
+- fi
+- done
+- done
+- IFS="$ac_save_IFS"
+- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+- ;;
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
++int
++main ()
++{
++return $ac_func ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-XGETTEXT="$ac_cv_path_XGETTEXT"
+-if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+-$as_echo "$XGETTEXT" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_var=yes"
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+- rm -f messages.po
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ eval "$as_ac_var=no"
++fi
+
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- ac_executable_p="test -x"
+-else
+- ac_executable_p="test -f"
+ fi
+-rm -f conf$$.file
++done
+
+-# Extract the first word of "msgmerge", so it can be a program name with args.
+-set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++
++ { echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
++echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl__snprintf+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case "$MSGMERGE" in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+- ;;
+- *)
+- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$ac_save_IFS"
+- test -z "$ac_dir" && ac_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+- if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+- ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+- break 2
+- fi
+- fi
+- done
+- done
+- IFS="$ac_save_IFS"
+- test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+- ;;
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++
++#ifndef _snprintf
++ char *p = (char *) _snprintf;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-MSGMERGE="$ac_cv_path_MSGMERGE"
+-if test "$MSGMERGE" != ":"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+-$as_echo "$MSGMERGE" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl__snprintf=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- if test "$GMSGFMT" != ":"; then
+- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- : ;
+- else
+- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+-$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
+- GMSGFMT=":"
+- fi
+- fi
++ ac_cv_have_decl__snprintf=no
++fi
+
+- if test "$XGETTEXT" != ":"; then
+- if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+- (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- : ;
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+- XGETTEXT=":"
+- fi
+- rm -f messages.po
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
++echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6; }
++ if test $ac_cv_have_decl__snprintf = yes; then
++ gt_value=1
++ else
++ gt_value=0
+ fi
+
+- ac_config_commands="$ac_config_commands default-1"
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL__SNPRINTF $gt_value
++_ACEOF
+
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$RANLIB"; then
+- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+
+-fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+-$as_echo "$RANLIB" >&6; }
++ { echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
++echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl__snwprintf+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
+
++#ifndef _snwprintf
++ char *p = (char *) _snwprintf;
++#endif
+
+-fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+- ac_ct_RANLIB=$RANLIB
+- # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_RANLIB"; then
+- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl__snwprintf=yes
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_RANLIB="ranlib"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+-$as_echo "$ac_ct_RANLIB" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ ac_cv_have_decl__snwprintf=no
+ fi
+
+- if test "x$ac_ct_RANLIB" = x; then
+- RANLIB=":"
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
++echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6; }
++ if test $ac_cv_have_decl__snwprintf = yes; then
++ gt_value=1
+ else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- RANLIB=$ac_ct_RANLIB
++ gt_value=0
+ fi
+-else
+- RANLIB="$ac_cv_prog_RANLIB"
+-fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL__SNWPRINTF $gt_value
++_ACEOF
++
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
+-$as_echo_n "checking for strerror in -lcposix... " >&6; }
+-if test "${ac_cv_lib_cposix_strerror+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++ { echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
++echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcposix $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char strerror ();
++#include <stdio.h>
+ int
+ main ()
+ {
+-return strerror ();
++
++#ifndef feof_unlocked
++ char *p = (char *) feof_unlocked;
++#endif
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_cposix_strerror=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl_feof_unlocked=yes
+ else
+- ac_cv_lib_cposix_strerror=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_have_decl_feof_unlocked=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
+-$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+-if test "x$ac_cv_lib_cposix_strerror" = x""yes; then :
+- LIBS="$LIBS -lcposix"
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
++echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6; }
++ if test $ac_cv_have_decl_feof_unlocked = yes; then
++ gt_value=1
++ else
++ gt_value=0
++ fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_FEOF_UNLOCKED $gt_value
++_ACEOF
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if test "${ac_cv_c_const+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
++echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
++#include <stdio.h>
+ int
+ main ()
+ {
+-/* FIXME: Include the comments suggested by Paul. */
+-#ifndef __cplusplus
+- /* Ultrix mips cc rejects this. */
+- typedef int charset[2];
+- const charset cs;
+- /* SunOS 4.1.1 cc rejects this. */
+- char const *const *pcpcc;
+- char **ppc;
+- /* NEC SVR4.0.2 mips cc rejects this. */
+- struct point {int x, y;};
+- static struct point const zero = {0,0};
+- /* AIX XL C 1.02.0.0 rejects this.
+- It does not let you subtract one const X* pointer from another in
+- an arm of an if-expression whose if-part is not a constant
+- expression */
+- const char *g = "string";
+- pcpcc = &g + (g ? g-g : 0);
+- /* HPUX 7.0 cc rejects these. */
+- ++pcpcc;
+- ppc = (char**) pcpcc;
+- pcpcc = (char const *const *) ppc;
+- { /* SCO 3.2v4 cc rejects this. */
+- char *t;
+- char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+- *t++ = 0;
+- if (s) return 0;
+- }
+- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+- int x[] = {25, 17};
+- const int *foo = &x[0];
+- ++foo;
+- }
+- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+- typedef const int *iptr;
+- iptr p = 0;
+- ++p;
+- }
+- { /* AIX XL C 1.02.0.0 rejects this saying
+- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+- struct s { int j; const int *ap[3]; };
+- struct s *b; b->j = 5;
+- }
+- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+- const int foo = 10;
+- if (!foo) return 0;
+- }
+- return !cs[0] && !zero.x;
++#ifndef fgets_unlocked
++ char *p = (char *) fgets_unlocked;
+ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_c_const=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl_fgets_unlocked=yes
+ else
+- ac_cv_c_const=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_have_decl_fgets_unlocked=no
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+-$as_echo "$ac_cv_c_const" >&6; }
+-if test $ac_cv_c_const = no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
++echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6; }
++ if test $ac_cv_have_decl_fgets_unlocked = yes; then
++ gt_value=1
++ else
++ gt_value=0
++ fi
+
+-$as_echo "#define const /**/" >>confdefs.h
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_FGETS_UNLOCKED $gt_value
++_ACEOF
+
+-fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed" >&5
+-$as_echo_n "checking for signed... " >&6; }
+-if test "${bh_cv_c_signed+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
++echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
++#include <stdio.h>
+ int
+ main ()
+ {
+-signed char x;
++
++#ifndef getc_unlocked
++ char *p = (char *) getc_unlocked;
++#endif
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- bh_cv_c_signed=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl_getc_unlocked=yes
+ else
+- bh_cv_c_signed=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_have_decl_getc_unlocked=no
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bh_cv_c_signed" >&5
+-$as_echo "$bh_cv_c_signed" >&6; }
+- if test $bh_cv_c_signed = no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
++echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; }
++ if test $ac_cv_have_decl_getc_unlocked = yes; then
++ gt_value=1
++ else
++ gt_value=0
++ fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_GETC_UNLOCKED $gt_value
++_ACEOF
++
+
+-$as_echo "#define signed /**/" >>confdefs.h
+
++ case $gt_cv_func_printf_posix in
++ *yes) HAVE_POSIX_PRINTF=1 ;;
++ *) HAVE_POSIX_PRINTF=0 ;;
++ esac
++
++ if test "$ac_cv_func_asprintf" = yes; then
++ HAVE_ASPRINTF=1
++ else
++ HAVE_ASPRINTF=0
+ fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+-$as_echo_n "checking for inline... " >&6; }
+-if test "${ac_cv_c_inline+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_c_inline=no
+-for ac_kw in inline __inline__ __inline; do
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifndef __cplusplus
+-typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
+-#endif
++ if test "$ac_cv_func_snprintf" = yes; then
++ HAVE_SNPRINTF=1
++ else
++ HAVE_SNPRINTF=0
++ fi
+
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_c_inline=$ac_kw
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- test "$ac_cv_c_inline" != no && break
+-done
++ if test "$ac_cv_func_wprintf" = yes; then
++ HAVE_WPRINTF=1
++ else
++ HAVE_WPRINTF=0
++ fi
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
+
+-case $ac_cv_c_inline in
+- inline | yes) ;;
+- *)
+- case $ac_cv_c_inline in
+- no) ac_val=;;
+- *) ac_val=$ac_cv_c_inline;;
+- esac
+- cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+- ;;
+-esac
+
+-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+-if test "x$ac_cv_type_off_t" = x""yes; then :
+
+-else
+
+-cat >>confdefs.h <<_ACEOF
+-#define off_t long int
+-_ACEOF
+
+-fi
+
+-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+-if test "x$ac_cv_type_size_t" = x""yes; then :
++ am_save_CPPFLAGS="$CPPFLAGS"
+
+-else
++ for element in $INCICONV; do
++ haveit=
++ for x in $CPPFLAGS; do
+
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
+-_ACEOF
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-fi
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
++ fi
++ done
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long" >&5
+-$as_echo_n "checking for long long... " >&6; }
+-if test "${ac_cv_type_long_long+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for iconv" >&5
++echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
++if test "${am_cv_func_iconv+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++ am_cv_func_iconv="no, consider installing GNU libiconv"
++ am_cv_lib_iconv=no
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-long long ll = 1LL; int i = 63;
++#include <stdlib.h>
++#include <iconv.h>
+ int
+ main ()
+ {
+-long long llmax = (long long) -1;
+- return ll << i | ll >> i | llmax / ll | llmax % ll;
++iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_type_long_long=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ am_cv_func_iconv=yes
+ else
+- ac_cv_type_long_long=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long" >&5
+-$as_echo "$ac_cv_type_long_long" >&6; }
+- if test $ac_cv_type_long_long = yes; then
+-
+-$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- fi
+
++fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
+-$as_echo_n "checking for long double... " >&6; }
+-if test "${gt_cv_c_long_double+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$GCC" = yes; then
+- gt_cv_c_long_double=yes
+- else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$am_cv_func_iconv" != yes; then
++ am_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBICONV"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
+- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
+- long double foo = 0.0;
+- /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
+- int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+-
++#include <stdlib.h>
++#include <iconv.h>
+ int
+ main ()
+ {
+-
++iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- gt_cv_c_long_double=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ am_cv_lib_iconv=yes
++ am_cv_func_iconv=yes
+ else
+- gt_cv_c_long_double=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$am_save_LIBS"
++ fi
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_long_double" >&5
+-$as_echo "$gt_cv_c_long_double" >&6; }
+- if test $gt_cv_c_long_double = yes; then
++{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
++echo "${ECHO_T}$am_cv_func_iconv" >&6; }
++ if test "$am_cv_func_iconv" = yes; then
+
+-$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_ICONV 1
++_ACEOF
+
+ fi
++ if test "$am_cv_lib_iconv" = yes; then
++ { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
++echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $LIBICONV" >&5
++echo "${ECHO_T}$LIBICONV" >&6; }
++ else
++ CPPFLAGS="$am_save_CPPFLAGS"
++ LIBICONV=
++ LTLIBICONV=
++ fi
++
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+-$as_echo_n "checking for wchar_t... " >&6; }
+-if test "${gt_cv_c_wchar_t+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ if test "$am_cv_func_iconv" = yes; then
++ { echo "$as_me:$LINENO: checking for iconv declaration" >&5
++echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
++ if test "${am_cv_proto_iconv+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stddef.h>
+- wchar_t foo = (wchar_t)'\0';
++
++#include <stdlib.h>
++#include <iconv.h>
++extern
++#ifdef __cplusplus
++"C"
++#endif
++#if defined(__STDC__) || defined(__cplusplus)
++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
++#else
++size_t iconv();
++#endif
++
+ int
+ main ()
+ {
+@@ -6329,1503 +10966,2019 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- gt_cv_c_wchar_t=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ am_cv_proto_iconv_arg1=""
+ else
+- gt_cv_c_wchar_t=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ am_cv_proto_iconv_arg1="const"
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+-$as_echo "$gt_cv_c_wchar_t" >&6; }
+- if test $gt_cv_c_wchar_t = yes; then
+
+-$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
++ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
++ { echo "$as_me:$LINENO: result: ${ac_t:-
++ }$am_cv_proto_iconv" >&5
++echo "${ECHO_T}${ac_t:-
++ }$am_cv_proto_iconv" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define ICONV_CONST $am_cv_proto_iconv_arg1
++_ACEOF
+
+ fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+-$as_echo_n "checking for wint_t... " >&6; }
+-if test "${gt_cv_c_wint_t+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
++echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
++if test "${am_cv_langinfo_codeset+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <wchar.h>
+- wint_t foo = (wchar_t)'\0';
++#include <langinfo.h>
+ int
+ main ()
+ {
+-
++char* cs = nl_langinfo(CODESET);
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- gt_cv_c_wint_t=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ am_cv_langinfo_codeset=yes
+ else
+- gt_cv_c_wint_t=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ am_cv_langinfo_codeset=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+-$as_echo "$gt_cv_c_wint_t" >&6; }
+- if test $gt_cv_c_wint_t = yes; then
++{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
++echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
++ if test $am_cv_langinfo_codeset = yes; then
+
+-$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LANGINFO_CODESET 1
++_ACEOF
+
+ fi
+
++ if test $ac_cv_header_locale_h = yes; then
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+-$as_echo_n "checking for inttypes.h... " >&6; }
+-if test "${jm_ac_cv_header_inttypes_h+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <sys/types.h>
+-#include <inttypes.h>
++#include <locale.h>
+ int
+ main ()
+ {
+-uintmax_t i = (uintmax_t) -1;
++return LC_MESSAGES
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- jm_ac_cv_header_inttypes_h=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ am_cv_val_LC_MESSAGES=yes
+ else
+- jm_ac_cv_header_inttypes_h=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ am_cv_val_LC_MESSAGES=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_inttypes_h" >&5
+-$as_echo "$jm_ac_cv_header_inttypes_h" >&6; }
+- if test $jm_ac_cv_header_inttypes_h = yes; then
++{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
++ if test $am_cv_val_LC_MESSAGES = yes; then
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LC_MESSAGES 1
+ _ACEOF
+
+ fi
+
++ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
+-$as_echo_n "checking for stdint.h... " >&6; }
+-if test "${jm_ac_cv_header_stdint_h+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ for ac_prog in bison
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_INTLBISON+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <stdint.h>
+-int
+-main ()
+-{
+-uintmax_t i = (uintmax_t) -1;
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- jm_ac_cv_header_stdint_h=yes
++ if test -n "$INTLBISON"; then
++ ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
+ else
+- jm_ac_cv_header_stdint_h=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_INTLBISON="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_stdint_h" >&5
+-$as_echo "$jm_ac_cv_header_stdint_h" >&6; }
+- if test $jm_ac_cv_header_stdint_h = yes; then
++INTLBISON=$ac_cv_prog_INTLBISON
++if test -n "$INTLBISON"; then
++ { echo "$as_me:$LINENO: result: $INTLBISON" >&5
++echo "${ECHO_T}$INTLBISON" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STDINT_H_WITH_UINTMAX 1
+-_ACEOF
+
++ test -n "$INTLBISON" && break
++done
++
++ if test -z "$INTLBISON"; then
++ ac_verc_fail=yes
++ else
++ { echo "$as_me:$LINENO: checking version of bison" >&5
++echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
++ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
++ case $ac_prog_version in
++ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
++ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
++ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
++ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
++ esac
++ { echo "$as_me:$LINENO: result: $ac_prog_version" >&5
++echo "${ECHO_T}$ac_prog_version" >&6; }
++ fi
++ if test $ac_verc_fail = yes; then
++ INTLBISON=:
+ fi
+
+
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
+-$as_echo_n "checking for intmax_t... " >&6; }
+-if test "${gt_cv_c_intmax_t+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++
++
++
++
++
++
++
++
++
++
++
++ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
++ # Check whether --enable-nls was given.
++if test "${enable_nls+set}" = set; then
++ enableval=$enable_nls; USE_NLS=$enableval
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ USE_NLS=yes
++fi
+
+-#include <stddef.h>
+-#include <stdlib.h>
+-#if HAVE_STDINT_H_WITH_UINTMAX
+-#include <stdint.h>
+-#endif
+-#if HAVE_INTTYPES_H_WITH_UINTMAX
+-#include <inttypes.h>
+-#endif
++ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
++echo "${ECHO_T}$USE_NLS" >&6; }
++
++
++
++
++ BUILD_INCLUDED_LIBINTL=no
++ USE_INCLUDED_LIBINTL=no
++
++ LIBINTL=
++ LTLIBINTL=
++ POSUB=
++
++ if test "$USE_NLS" = "yes"; then
++ gt_use_preinstalled_gnugettext=no
++
++ { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
++echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; }
+
++# Check whether --with-included-gettext was given.
++if test "${with_included_gettext+set}" = set; then
++ withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
++else
++ nls_cv_force_use_gnu_gettext=no
++fi
++
++ { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
++echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
++
++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
++
++
++
++
++
++
++ { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
++echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
++if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <libintl.h>
++extern int _nl_msg_cat_cntr;
++extern int *_nl_domain_bindings;
+ int
+ main ()
+ {
+-intmax_t x = -1;
++bindtextdomain ("", "");
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- gt_cv_c_intmax_t=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ gt_cv_func_gnugettext1_libc=yes
+ else
+- gt_cv_c_intmax_t=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ gt_cv_func_gnugettext1_libc=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5
+-$as_echo "$gt_cv_c_intmax_t" >&6; }
+- if test $gt_cv_c_intmax_t = yes; then
++{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
++echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
++
++ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
++
++
++
++ use_additional=yes
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
+
+-$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h
++# Check whether --with-libintl-prefix was given.
++if test "${with_libintl_prefix+set}" = set; then
++ withval=$with_libintl_prefix;
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
+
+- fi
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
+
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5
+-$as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; }
+-if test "${gt_cv_func_printf_posix+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
++fi
+
+- if test "$cross_compiling" = yes; then :
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='intl '
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
++ else
++ :
++ fi
++ else
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ if test $use_additional = yes; then
++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
++ found_dir="$additional_libdir"
++ found_so="$additional_libdir/lib$name.$shlibext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ else
++ if test -f "$additional_libdir/lib$name.$libext"; then
++ found_dir="$additional_libdir"
++ found_a="$additional_libdir/lib$name.$libext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIBINTL; do
+
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+- notposix
+-#endif
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
++ found_dir="$dir"
++ found_so="$dir/lib$name.$shlibext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ else
++ if test -f "$dir/lib$name.$libext"; then
++ found_dir="$dir"
++ found_a="$dir/lib$name.$libext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ if test "$hardcode_direct" = yes; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ haveit=
++ for x in $LDFLAGS $LIBINTL; do
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "notposix" >/dev/null 2>&1; then :
+- gt_cv_func_printf_posix="guessing no"
+-else
+- gt_cv_func_printf_posix="guessing yes"
+-fi
+-rm -f conftest*
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
++ fi
++ if test "$hardcode_minus_L" != no; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
++ fi
++ fi
++ additional_includedir=
++ case "$found_dir" in
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INCINTL; do
+
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-#include <stdio.h>
+-#include <string.h>
+-/* The string "%2$d %1$d", with dollar characters protected from the shell's
+- dollar expansion (possibly an autoconf bug). */
+-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+-static char buf[100];
+-int main ()
+-{
+- sprintf (buf, format, 33, 55);
+- return (strcmp (buf, "55 33") != 0);
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- gt_cv_func_printf_posix=yes
+-else
+- gt_cv_func_printf_posix=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test -n "$found_la"; then
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIBINTL; do
+
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_printf_posix" >&5
+-$as_echo "$gt_cv_func_printf_posix" >&6; }
+- case $gt_cv_func_printf_posix in
+- *yes)
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
++ for x in $LDFLAGS $LTLIBINTL; do
+
+-$as_echo "#define HAVE_POSIX_PRINTF 1" >>confdefs.h
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+- ;;
+- esac
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ ;;
++ -R*)
++ dir=`echo "X$dep" | sed -e 's/^X-R//'`
++ if test "$enable_rpath" != no; then
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $dir"
++ fi
++ fi
++ ;;
++ -l*)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
++ ;;
++ *.la)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
++ ;;
++ *)
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
++ ;;
++ esac
++ done
++ fi
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
++ fi
++ fi
++ fi
++ done
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n "$hardcode_libdir_separator"; then
++ alldirs=
++ for found_dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ done
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ else
++ for found_dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$found_dir"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ done
++ fi
++ fi
++ if test "X$ltrpathdirs" != "X"; then
++ for found_dir in $ltrpathdirs; do
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
++ done
++ fi
+
+-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+-# for constant arguments. Useless!
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+-$as_echo_n "checking for working alloca.h... " >&6; }
+-if test "${ac_cv_working_alloca_h+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
++echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
++if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <alloca.h>
+-int
+-main ()
+-{
+-char *p = (char *) alloca (2 * sizeof (int));
+- if (p) return 0;
+- ;
+- return 0;
+-}
++ gt_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $INCINTL"
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBINTL"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_working_alloca_h=yes
+-else
+- ac_cv_working_alloca_h=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+-$as_echo "$ac_cv_working_alloca_h" >&6; }
+-if test $ac_cv_working_alloca_h = yes; then
+-
+-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+-$as_echo_n "checking for alloca... " >&6; }
+-if test "${ac_cv_func_alloca_works+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#ifdef __GNUC__
+-# define alloca __builtin_alloca
+-#else
+-# ifdef _MSC_VER
+-# include <malloc.h>
+-# define alloca _alloca
+-# else
+-# ifdef HAVE_ALLOCA_H
+-# include <alloca.h>
+-# else
+-# ifdef _AIX
+- #pragma alloca
+-# else
+-# ifndef alloca /* predefined by HP cc +Olibcalls */
+-char *alloca ();
+-# endif
+-# endif
+-# endif
+-# endif
++#include <libintl.h>
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
+ #endif
+-
++const char *_nl_expand_alias ();
+ int
+ main ()
+ {
+-char *p = (char *) alloca (1);
+- if (p) return 0;
++bindtextdomain ("", "");
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_func_alloca_works=yes
+-else
+- ac_cv_func_alloca_works=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+-$as_echo "$ac_cv_func_alloca_works" >&6; }
+-
+-if test $ac_cv_func_alloca_works = yes; then
+-
+-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+-
+-else
+- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+-# that cause trouble. Some versions do not even contain alloca or
+-# contain a buggy version. If you still want to use their alloca,
+-# use ar to extract alloca.o from them instead of compiling alloca.c.
+-
+-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+-
+-$as_echo "#define C_ALLOCA 1" >>confdefs.h
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+-if test "${ac_cv_os_cray+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#if defined CRAY && ! defined CRAY2
+-webecray
+-#else
+-wenotbecray
+-#endif
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "webecray" >/dev/null 2>&1; then :
+- ac_cv_os_cray=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ gt_cv_func_gnugettext1_libintl=yes
+ else
+- ac_cv_os_cray=no
+-fi
+-rm -f conftest*
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ gt_cv_func_gnugettext1_libintl=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+-$as_echo "$ac_cv_os_cray" >&6; }
+-if test $ac_cv_os_cray = yes; then
+- for ac_func in _getb67 GETB67 getb67; do
+- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
+
+-cat >>confdefs.h <<_ACEOF
+-#define CRAY_STACKSEG_END $ac_func
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
++ LIBS="$LIBS $LIBICONV"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-
+- break
+-fi
+-
+- done
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+-$as_echo_n "checking stack direction for C alloca... " >&6; }
+-if test "${ac_cv_c_stack_direction+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- ac_cv_c_stack_direction=0
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_includes_default
+-int
+-find_stack_direction ()
+-{
+- static char *addr = 0;
+- auto char dummy;
+- if (addr == 0)
+- {
+- addr = &dummy;
+- return find_stack_direction ();
+- }
+- else
+- return (&dummy > addr) ? 1 : -1;
+-}
+-
++#include <libintl.h>
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias ();
+ int
+ main ()
+ {
+- return find_stack_direction () < 0;
++bindtextdomain ("", "");
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
++ ;
++ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- ac_cv_c_stack_direction=1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ LIBINTL="$LIBINTL $LIBICONV"
++ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
++ gt_cv_func_gnugettext1_libintl=yes
++
+ else
+- ac_cv_c_stack_direction=-1
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ fi
++ CPPFLAGS="$gt_save_CPPFLAGS"
++ LIBS="$gt_save_LIBS"
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+-$as_echo "$ac_cv_c_stack_direction" >&6; }
+-cat >>confdefs.h <<_ACEOF
+-#define STACK_DIRECTION $ac_cv_c_stack_direction
+-_ACEOF
++{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
++echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
++ fi
+
++ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
++ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
++ && test "$PACKAGE" != gettext-runtime \
++ && test "$PACKAGE" != gettext-tools; }; then
++ gt_use_preinstalled_gnugettext=yes
++ else
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ fi
+
+-fi
+
+-for ac_header in stdlib.h unistd.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
++ nls_cv_use_gnu_gettext=yes
++ fi
++ fi
+
+-fi
++ if test "$nls_cv_use_gnu_gettext" = "yes"; then
++ BUILD_INCLUDED_LIBINTL=yes
++ USE_INCLUDED_LIBINTL=yes
++ LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
++ LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
++ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
++ fi
+
+-done
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ CATOBJEXT=.gmo
++ fi
+
+-for ac_func in getpagesize
+-do :
+- ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+-if test "x$ac_cv_func_getpagesize" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_GETPAGESIZE 1
+-_ACEOF
+
+-fi
+-done
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+-$as_echo_n "checking for working mmap... " >&6; }
+-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- ac_cv_func_mmap_fixed_mapped=no
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-$ac_includes_default
+-/* malloc might have been renamed as rpl_malloc. */
+-#undef malloc
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_NLS 1
++_ACEOF
+
+-/* Thanks to Mike Haertel and Jim Avera for this test.
+- Here is a matrix of mmap possibilities:
+- mmap private not fixed
+- mmap private fixed at somewhere currently unmapped
+- mmap private fixed at somewhere already mapped
+- mmap shared not fixed
+- mmap shared fixed at somewhere currently unmapped
+- mmap shared fixed at somewhere already mapped
+- For private mappings, we should verify that changes cannot be read()
+- back from the file, nor mmap's back from the file at a different
+- address. (There have been systems where private was not correctly
+- implemented like the infamous i386 svr4.0, and systems where the
+- VM page cache was not coherent with the file system buffer cache
+- like early versions of FreeBSD and possibly contemporary NetBSD.)
+- For shared mappings, we should conversely verify that changes get
+- propagated back to all the places they're supposed to be.
++ else
++ USE_NLS=no
++ fi
++ fi
+
+- Grep wants private fixed already mapped.
+- The main things grep needs to know about mmap are:
+- * does it exist and is it safe to write into the mmap'd area
+- * how to use it (BSD variants) */
++ { echo "$as_me:$LINENO: checking whether to use NLS" >&5
++echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
++echo "${ECHO_T}$USE_NLS" >&6; }
++ if test "$USE_NLS" = "yes"; then
++ { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
++echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
++ gt_source="external libintl"
++ else
++ gt_source="libc"
++ fi
++ else
++ gt_source="included intl directory"
++ fi
++ { echo "$as_me:$LINENO: result: $gt_source" >&5
++echo "${ECHO_T}$gt_source" >&6; }
++ fi
+
+-#include <fcntl.h>
+-#include <sys/mman.h>
++ if test "$USE_NLS" = "yes"; then
+
+-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+-char *malloc ();
+-#endif
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
++ { echo "$as_me:$LINENO: checking how to link with libintl" >&5
++echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $LIBINTL" >&5
++echo "${ECHO_T}$LIBINTL" >&6; }
+
+-/* This mess was copied from the GNU getpagesize.h. */
+-#ifndef HAVE_GETPAGESIZE
+-/* Assume that all systems that can run configure have sys/param.h. */
+-# ifndef HAVE_SYS_PARAM_H
+-# define HAVE_SYS_PARAM_H 1
+-# endif
++ for element in $INCINTL; do
++ haveit=
++ for x in $CPPFLAGS; do
+
+-# ifdef _SC_PAGESIZE
+-# define getpagesize() sysconf(_SC_PAGESIZE)
+-# else /* no _SC_PAGESIZE */
+-# ifdef HAVE_SYS_PARAM_H
+-# include <sys/param.h>
+-# ifdef EXEC_PAGESIZE
+-# define getpagesize() EXEC_PAGESIZE
+-# else /* no EXEC_PAGESIZE */
+-# ifdef NBPG
+-# define getpagesize() NBPG * CLSIZE
+-# ifndef CLSIZE
+-# define CLSIZE 1
+-# endif /* no CLSIZE */
+-# else /* no NBPG */
+-# ifdef NBPC
+-# define getpagesize() NBPC
+-# else /* no NBPC */
+-# ifdef PAGESIZE
+-# define getpagesize() PAGESIZE
+-# endif /* PAGESIZE */
+-# endif /* no NBPC */
+-# endif /* no NBPG */
+-# endif /* no EXEC_PAGESIZE */
+-# else /* no HAVE_SYS_PARAM_H */
+-# define getpagesize() 8192 /* punt totally */
+-# endif /* no HAVE_SYS_PARAM_H */
+-# endif /* no _SC_PAGESIZE */
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-#endif /* no HAVE_GETPAGESIZE */
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
++ fi
++ done
+
+-int
+-main ()
+-{
+- char *data, *data2, *data3;
+- int i, pagesize;
+- int fd;
++ fi
+
+- pagesize = getpagesize ();
+
+- /* First, make a file with some known garbage in it. */
+- data = (char *) malloc (pagesize);
+- if (!data)
+- return 1;
+- for (i = 0; i < pagesize; ++i)
+- *(data + i) = rand ();
+- umask (0);
+- fd = creat ("conftest.mmap", 0600);
+- if (fd < 0)
+- return 1;
+- if (write (fd, data, pagesize) != pagesize)
+- return 1;
+- close (fd);
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETTEXT 1
++_ACEOF
+
+- /* Next, try to mmap the file at a fixed address which already has
+- something else allocated at it. If we can, also make sure that
+- we see the same garbage. */
+- fd = open ("conftest.mmap", O_RDWR);
+- if (fd < 0)
+- return 1;
+- data2 = (char *) malloc (2 * pagesize);
+- if (!data2)
+- return 1;
+- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+- MAP_PRIVATE | MAP_FIXED, fd, 0L))
+- return 1;
+- for (i = 0; i < pagesize; ++i)
+- if (*(data + i) != *(data2 + i))
+- return 1;
+
+- /* Finally, make sure that changes to the mapped area do not
+- percolate back to the file as seen by read(). (This is a bug on
+- some variants of i386 svr4.0.) */
+- for (i = 0; i < pagesize; ++i)
+- *(data2 + i) = *(data2 + i) + 1;
+- data3 = (char *) malloc (pagesize);
+- if (!data3)
+- return 1;
+- if (read (fd, data3, pagesize) != pagesize)
+- return 1;
+- for (i = 0; i < pagesize; ++i)
+- if (*(data + i) != *(data3 + i))
+- return 1;
+- close (fd);
+- return 0;
+-}
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_DCGETTEXT 1
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- ac_cv_func_mmap_fixed_mapped=yes
+-else
+- ac_cv_func_mmap_fixed_mapped=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+-if test $ac_cv_func_mmap_fixed_mapped = yes; then
++ fi
+
+-$as_echo "#define HAVE_MMAP 1" >>confdefs.h
++ POSUB=po
++ fi
+
+-fi
+-rm -f conftest.mmap
+
++ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
++ BUILD_INCLUDED_LIBINTL=yes
++ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+-$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+-if test "${ac_cv_gnu_library_2_1+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+
+-#include <features.h>
+-#ifdef __GNU_LIBRARY__
+- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+- Lucky GNU user
+- #endif
+-#endif
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
+- ac_cv_gnu_library_2_1=yes
+-else
+- ac_cv_gnu_library_2_1=no
+-fi
+-rm -f conftest*
+
+
++ nls_cv_header_intl=
++ nls_cv_header_libgt=
++
++ DATADIRNAME=share
++
++
++ INSTOBJEXT=.mo
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+-$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+- GLIBC21="$ac_cv_gnu_library_2_1"
++ GENCAT=gencat
+
+
++ if test "$USE_INCLUDED_LIBINTL" = yes; then
++ INTLOBJS="\$(GETTOBJS)"
++ fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5
+-$as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
+-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
++ INTL_LIBTOOL_SUFFIX_PREFIX=
+
+- if test "$cross_compiling" = yes; then :
+
+- # Guess based on the CPU.
+- case "$host_cpu" in
+- alpha* | i3456786 | m68k | s390*)
+- gt_cv_int_divbyzero_sigfpe="guessing yes";;
+- *)
+- gt_cv_int_divbyzero_sigfpe="guessing no";;
+- esac
+
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ INTLLIBS="$LIBINTL"
+
+-#include <stdlib.h>
+-#include <signal.h>
+
+-static void
+-#ifdef __cplusplus
+-sigfpe_handler (int sig)
+-#else
+-sigfpe_handler (sig) int sig;
+-#endif
+-{
+- /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
+- exit (sig != SIGFPE);
+-}
+
+-int x = 1;
+-int y = 0;
+-int z;
+-int nan;
+
+-int main ()
+-{
+- signal (SIGFPE, sigfpe_handler);
+-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
+-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+- signal (SIGTRAP, sigfpe_handler);
+-#endif
+-/* Linux/SPARC yields signal SIGILL. */
+-#if defined (__sparc__) && defined (__linux__)
+- signal (SIGILL, sigfpe_handler);
+-#endif
+
+- z = x / y;
+- nan = y / y;
+- exit (1);
+-}
+
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- gt_cv_int_divbyzero_sigfpe=yes
++
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- gt_cv_int_divbyzero_sigfpe=no
++ cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
++all:
++ @echo '@@@%%%=$(MAKE)=@@@%%%'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++ *@@@%%%=?*=@@@%%%*)
++ eval ac_cv_prog_make_${ac_make}_set=yes;;
++ *)
++ eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
++rm -f conftest.make
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ SET_MAKE=
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
++ { echo "$as_me:$LINENO: checking for GNU make" >&5
++echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; }
++if test "${_cv_gnu_make_command+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ _cv_gnu_make_command='' ;
++ for a in "$MAKE" make gmake gnumake ; do
++ if test -z "$a" ; then continue ; fi ;
++ if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
++ _cv_gnu_make_command=$a ;
++ break;
++ fi
++ done ;
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5
+-$as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; }
+- case "$gt_cv_int_divbyzero_sigfpe" in
+- *yes) value=1;;
+- *) value=0;;
+- esac
+-
+-cat >>confdefs.h <<_ACEOF
+-#define INTDIV0_RAISES_SIGFPE $value
+-_ACEOF
++{ echo "$as_me:$LINENO: result: $_cv_gnu_make_command" >&5
++echo "${ECHO_T}$_cv_gnu_make_command" >&6; } ;
++ if test "x$_cv_gnu_make_command" != "x" ; then
++ ifGNUmake='' ;
++ ifNotGNUmake='#' ;
++ else
++ ifGNUmake='#' ;
++ ifNotGNUmake='' ;
++ { echo "$as_me:$LINENO: result: \"Not found\"" >&5
++echo "${ECHO_T}\"Not found\"" >&6; };
++ fi
+
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long" >&5
+-$as_echo_n "checking for unsigned long long... " >&6; }
+-if test "${ac_cv_type_unsigned_long_long+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-unsigned long long ull = 1ULL; int i = 63;
+-int
+-main ()
+-{
+-unsigned long long ullmax = (unsigned long long) -1;
+- return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_type_unsigned_long_long=yes
++# Extract the first word of "ln", so it can be a program name with args.
++set dummy ln; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_LN+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_type_unsigned_long_long=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long" >&5
+-$as_echo "$ac_cv_type_unsigned_long_long" >&6; }
+- if test $ac_cv_type_unsigned_long_long = yes; then
+-
+-$as_echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>confdefs.h
+-
++ case $LN in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_LN="$LN" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
++done
++done
++IFS=$as_save_IFS
+
++ test -z "$ac_cv_path_LN" && ac_cv_path_LN="ln"
++ ;;
++esac
++fi
++LN=$ac_cv_path_LN
++if test -n "$LN"; then
++ { echo "$as_me:$LINENO: result: $LN" >&5
++echo "${ECHO_T}$LN" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
++LN_S=$as_ln_s
++if test "$LN_S" = "ln -s"; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
++fi
+
+- if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+-
+- test $ac_cv_type_unsigned_long_long = yes \
+- && ac_type='unsigned long long' \
+- || ac_type='unsigned long'
+-
+-cat >>confdefs.h <<_ACEOF
+-#define uintmax_t $ac_type
+-_ACEOF
++# Extract the first word of "mv", so it can be a program name with args.
++set dummy mv; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MV+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MV in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MV="$MV" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+- else
++ test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv"
++ ;;
++esac
++fi
++MV=$ac_cv_path_MV
++if test -n "$MV"; then
++ { echo "$as_me:$LINENO: result: $MV" >&5
++echo "${ECHO_T}$MV" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-$as_echo "#define HAVE_UINTMAX_T 1" >>confdefs.h
+
++# Extract the first word of "cp", so it can be a program name with args.
++set dummy cp; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_CP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $CP in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_CP="$CP" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
++done
++done
++IFS=$as_save_IFS
+
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+-$as_echo_n "checking for inttypes.h... " >&6; }
+-if test "${gt_cv_header_inttypes_h+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ test -z "$ac_cv_path_CP" && ac_cv_path_CP="cp"
++ ;;
++esac
++fi
++CP=$ac_cv_path_CP
++if test -n "$CP"; then
++ { echo "$as_me:$LINENO: result: $CP" >&5
++echo "${ECHO_T}$CP" >&6; }
+ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <inttypes.h>
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- gt_cv_header_inttypes_h=yes
++# Extract the first word of "rm", so it can be a program name with args.
++set dummy rm; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_RM+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- gt_cv_header_inttypes_h=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ case $RM in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_RM="$RM" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
++ test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm"
++ ;;
++esac
++fi
++RM=$ac_cv_path_RM
++if test -n "$RM"; then
++ { echo "$as_me:$LINENO: result: $RM" >&5
++echo "${ECHO_T}$RM" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_header_inttypes_h" >&5
+-$as_echo "$gt_cv_header_inttypes_h" >&6; }
+- if test $gt_cv_header_inttypes_h = yes; then
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INTTYPES_H 1
+-_ACEOF
+
++# Extract the first word of "chmod", so it can be a program name with args.
++set dummy chmod; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_CHMOD+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $CHMOD in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
++done
++done
++IFS=$as_save_IFS
+
+-
+-
+- if test $gt_cv_header_inttypes_h = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
+-$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
+-if test "${gt_cv_inttypes_pri_broken+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ test -z "$ac_cv_path_CHMOD" && ac_cv_path_CHMOD=":"
++ ;;
++esac
++fi
++CHMOD=$ac_cv_path_CHMOD
++if test -n "$CHMOD"; then
++ { echo "$as_me:$LINENO: result: $CHMOD" >&5
++echo "${ECHO_T}$CHMOD" >&6; }
+ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <inttypes.h>
+-#ifdef PRId32
+-char *p = PRId32;
+-#endif
+-
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- gt_cv_inttypes_pri_broken=no
++for ac_prog in gawk mawk nawk awk
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_AWK+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- gt_cv_inttypes_pri_broken=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5
+-$as_echo "$gt_cv_inttypes_pri_broken" >&6; }
++ if test -n "$AWK"; then
++ ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_AWK="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
+- if test "$gt_cv_inttypes_pri_broken" = yes; then
++done
++done
++IFS=$as_save_IFS
+
+-cat >>confdefs.h <<_ACEOF
+-#define PRI_MACROS_BROKEN 1
+-_ACEOF
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++ { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+- fi
+
++ test -n "$AWK" && break
++done
+
+- for ac_header in stdint.h
+-do :
+- ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdint_h" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_STDINT_H 1
+-_ACEOF
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++ then ac_cv_path_EGREP="$GREP -E"
++ else
++ # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_path_EGREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
+
+-fi
+
++ $ac_path_EGREP_found && break 3
++ done
+ done
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
+-$as_echo_n "checking for SIZE_MAX... " >&6; }
+- result=
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++done
++IFS=$as_save_IFS
+
+-#include <limits.h>
+-#if HAVE_STDINT_H
+-#include <stdint.h>
+-#endif
+-#ifdef SIZE_MAX
+-Found it
+-#endif
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "Found it" >/dev/null 2>&1; then :
+- result=yes
+ fi
+-rm -f conftest*
+
+- if test -z "$result"; then
+- if ac_fn_c_compute_int "$LINENO" "~(size_t)0 / 10" "res_hi" "#include <stddef.h>"; then :
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
++fi
+
+ else
+- result=?
++ ac_cv_path_EGREP=$EGREP
+ fi
+
+
+- if ac_fn_c_compute_int "$LINENO" "~(size_t)0 % 10" "res_lo" "#include <stddef.h>"; then :
+-
+-else
+- result=?
++ fi
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
+
+
+- if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include <stddef.h>"; then :
++# Extract the first word of "sed", so it can be a program name with args.
++set dummy sed; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_SED+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $SED in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_SED="$SED" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
++ test -z "$ac_cv_path_SED" && ac_cv_path_SED="sed"
++ ;;
++esac
++fi
++SED=$ac_cv_path_SED
++if test -n "$SED"; then
++ { echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+ else
+- result=?
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+- if test "$fits_in_uint" = 1; then
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <stddef.h>
+- extern size_t foo;
+- extern unsigned long foo;
+-
+-int
+-main ()
+-{
++# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- fits_in_uint=0
++ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
++ ;;
++esac
++fi
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { echo "$as_me:$LINENO: result: $PERL" >&5
++echo "${ECHO_T}$PERL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test -z "$result"; then
+- if test "$fits_in_uint" = 1; then
+- result="$res_hi$res_lo"U
+- else
+- result="$res_hi$res_lo"UL
+- fi
+- else
+- result='~(size_t)0'
+- fi
+- fi
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+-$as_echo "$result" >&6; }
+- if test "$result" != yes; then
+
+-cat >>confdefs.h <<_ACEOF
+-#define SIZE_MAX $result
+-_ACEOF
+
++# Extract the first word of "ldconfig", so it can be a program name with args.
++set dummy ldconfig; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_LDCONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $LDCONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
++done
++done
++IFS=$as_save_IFS
+
+-
+-
+- for ac_header in stdint.h
+-do :
+- ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdint_h" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_STDINT_H 1
+-_ACEOF
+-
++ test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG=":"
++ ;;
++esac
++fi
++LDCONFIG=$ac_cv_path_LDCONFIG
++if test -n "$LDCONFIG"; then
++ { echo "$as_me:$LINENO: result: $LDCONFIG" >&5
++echo "${ECHO_T}$LDCONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$AR"; then
++ ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_AR="${ac_tool_prefix}ar"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
+ done
++IFS=$as_save_IFS
+
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++ { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+
+- if test "X$prefix" = "XNONE"; then
+- acl_final_prefix="$ac_default_prefix"
+- else
+- acl_final_prefix="$prefix"
+- fi
+- if test "X$exec_prefix" = "XNONE"; then
+- acl_final_exec_prefix='${prefix}'
+- else
+- acl_final_exec_prefix="$exec_prefix"
++fi
++if test -z "$ac_cv_prog_AR"; then
++ ac_ct_AR=$AR
++ # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_AR"; then
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_AR="ar"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+- prefix="$acl_save_prefix"
+-
++done
++done
++IFS=$as_save_IFS
+
+-# Check whether --with-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then :
+- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+- with_gnu_ld=no
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
++ if test "x$ac_ct_AR" = x; then
++ AR="ar"
+ else
+- PATH_SEPARATOR=:
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ AR=$ac_ct_AR
+ fi
+- rm -f conf$$.sh
+-fi
+-ac_prog=ld
+-if test "$GCC" = yes; then
+- # Check if gcc -print-prog-name=ld gives a path.
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+-$as_echo_n "checking for ld used by GCC... " >&6; }
+- case $host in
+- *-*-mingw*)
+- # gcc leaves a trailing carriage return which upsets mingw
+- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+- *)
+- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+- esac
+- case $ac_prog in
+- # Accept absolute paths.
+- [\\/]* | [A-Za-z]:[\\/]*)
+- re_direlt='/[^/][^/]*/\.\./'
+- # Canonicalize the path of ld
+- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+- done
+- test -z "$LD" && LD="$ac_prog"
+- ;;
+- "")
+- # If it fails, then pretend we aren't using GCC.
+- ac_prog=ld
+- ;;
+- *)
+- # If it is relative, then search for the first ld in PATH.
+- with_gnu_ld=unknown
+- ;;
+- esac
+-elif test "$with_gnu_ld" = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+-$as_echo_n "checking for GNU ld... " >&6; }
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+-$as_echo_n "checking for non-GNU ld... " >&6; }
++ AR="$ac_cv_prog_AR"
+ fi
+-if test "${acl_cv_path_LD+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -z "$LD"; then
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+- for ac_dir in $PATH; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- acl_cv_path_LD="$ac_dir/$ac_prog"
+- # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
+- # Break only if it was the GNU/non-GNU ld that we prefer.
+- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+- *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
+- *)
+- test "$with_gnu_ld" != yes && break ;;
+- esac
+- fi
+- done
+- IFS="$ac_save_ifs"
++ if test -n "$RANLIB"; then
++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+- acl_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
+-fi
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+-LD="$acl_cv_path_LD"
+-if test -n "$LD"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+-$as_echo "$LD" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+- acl_cv_prog_gnu_ld=yes ;;
+-*)
+- acl_cv_prog_gnu_ld=no ;;
+-esac
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+-with_gnu_ld=$acl_cv_prog_gnu_ld
+-
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+-$as_echo_n "checking for shared library run path origin... " >&6; }
+-if test "${acl_cv_rpath+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++ ac_ct_RANLIB=$RANLIB
++ # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-
+- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+- . ./conftest.sh
+- rm -f ./conftest.sh
+- acl_cv_rpath=done
++ if test -n "$ac_ct_RANLIB"; then
++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_RANLIB="ranlib"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+-$as_echo "$acl_cv_rpath" >&6; }
+- wl="$acl_cv_wl"
+- libext="$acl_cv_libext"
+- shlibext="$acl_cv_shlibext"
+- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+- hardcode_direct="$acl_cv_hardcode_direct"
+- hardcode_minus_L="$acl_cv_hardcode_minus_L"
+- # Check whether --enable-rpath was given.
+-if test "${enable_rpath+set}" = set; then :
+- enableval=$enable_rpath; :
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+- enable_rpath=yes
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++ if test "x$ac_ct_RANLIB" = x; then
++ RANLIB=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ RANLIB=$ac_ct_RANLIB
++ fi
++else
++ RANLIB="$ac_cv_prog_RANLIB"
++fi
+
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$STRIP"; then
++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++ ac_ct_STRIP=$STRIP
++ # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_STRIP"; then
++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_STRIP="strip"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+-
+- use_additional=yes
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+-
+-# Check whether --with-libiconv-prefix was given.
+-if test "${with_libiconv_prefix+set}" = set; then :
+- withval=$with_libiconv_prefix;
+- if test "X$withval" = "Xno"; then
+- use_additional=no
+- else
+- if test "X$withval" = "X"; then
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- else
+- additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
+- fi
+- fi
+-
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
++else
++ STRIP="$ac_cv_prog_STRIP"
+ fi
+
+- LIBICONV=
+- LTLIBICONV=
+- INCICONV=
+- rpathdirs=
+- ltrpathdirs=
+- names_already_handled=
+- names_next_round='iconv '
+- while test -n "$names_next_round"; do
+- names_this_round="$names_next_round"
+- names_next_round=
+- for name in $names_this_round; do
+- already_handled=
+- for n in $names_already_handled; do
+- if test "$n" = "$name"; then
+- already_handled=yes
+- break
+- fi
+- done
+- if test -z "$already_handled"; then
+- names_already_handled="$names_already_handled $name"
+- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+- eval value=\"\$HAVE_LIB$uppername\"
+- if test -n "$value"; then
+- if test "$value" = yes; then
+- eval value=\"\$LIB$uppername\"
+- test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+- eval value=\"\$LTLIB$uppername\"
+- test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+- else
+- :
+- fi
+- else
+- found_dir=
+- found_la=
+- found_so=
+- found_a=
+- if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- fi
+- fi
+- fi
+- if test "X$found_dir" = "X"; then
+- for x in $LDFLAGS $LTLIBICONV; do
++# Extract the first word of "makeinfo", so it can be a program name with args.
++set dummy makeinfo; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_MAKEINFO+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$MAKEINFO"; then
++ ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_MAKEINFO="makeinfo"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++fi
++fi
++MAKEINFO=$ac_cv_prog_MAKEINFO
++if test -n "$MAKEINFO"; then
++ { echo "$as_me:$LINENO: result: $MAKEINFO" >&5
++echo "${ECHO_T}$MAKEINFO" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+- case "$x" in
+- -L*)
+- dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
+- found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- fi
+- fi
+- ;;
+- esac
+- if test "X$found_dir" != "X"; then
+- break
+- fi
+- done
+- fi
+- if test "X$found_dir" != "X"; then
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+- if test "X$found_so" != "X"; then
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $found_dir"
+- fi
+- if test "$hardcode_direct" = yes; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $found_dir"
+- fi
+- else
+- haveit=
+- for x in $LDFLAGS $LIBICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++if test "_$MAKEINFO" = "_"; then
++ MAKEINFO="@echo Makeinfo is missing. Info documentation will not be built.;true"
++else
++ case "$MAKEINFO" in
++ */missing.*)
++ { echo "$as_me:$LINENO: WARNING:
++*** Makeinfo is missing. Info documentation will not be built." >&5
++echo "$as_me: WARNING:
++*** Makeinfo is missing. Info documentation will not be built." >&2;}
++ ;;
++ *)
++ ;;
++ esac
++fi
++
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# 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.
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
++if test -z "$INSTALL"; then
++if test "${ac_cv_path_install+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++ ./ | .// | /cC/* | \
++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++ /usr/ucb/* ) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ # Don't use installbsd from OSF since it installs stuff as root
++ # by default.
++ for ac_prog in ginstall scoinst install; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ 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.
++ :
++ 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
++ done
++ done
++ ;;
++esac
++done
++IFS=$as_save_IFS
+
+- if test "X$x" = "X-L$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+- fi
+- if test "$hardcode_minus_L" != no; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+- fi
+- fi
+- fi
+- fi
+- else
+- if test "X$found_a" != "X"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+- else
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+- fi
+- fi
+- additional_includedir=
+- case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+- additional_includedir="$basedir/include"
+- ;;
+- esac
+- if test "X$additional_includedir" != "X"; then
+- if test "X$additional_includedir" != "X/usr/include"; then
+- haveit=
+- if test "X$additional_includedir" = "X/usr/local/include"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux*) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- for x in $CPPFLAGS $INCICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++fi
++ if test "${ac_cv_path_install+set}" = set; then
++ INSTALL=$ac_cv_path_install
++ else
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
++ # break other packages using the cache if that directory is
++ # removed, or if the value is a relative name.
++ INSTALL=$ac_install_sh
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+- if test "X$x" = "X-I$additional_includedir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_includedir"; then
+- INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test -n "$found_la"; then
+- save_libdir="$libdir"
+- case "$found_la" in
+- */* | *\\*) . "$found_la" ;;
+- *) . "./$found_la" ;;
+- esac
+- libdir="$save_libdir"
+- for dep in $dependency_libs; do
+- case "$dep" in
+- -L*)
+- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+- if test "X$additional_libdir" != "X/usr/lib"; then
+- haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux*) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- haveit=
+- for x in $LDFLAGS $LIBICONV; do
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+- fi
+- fi
+- haveit=
+- for x in $LDFLAGS $LTLIBICONV; do
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++# See if we need a separate native compiler.
++if test $cross_compiling = no; then
++ BUILD_CC="$CC"
+
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+- fi
+- fi
+- fi
+- fi
+- ;;
+- -R*)
+- dir=`echo "X$dep" | sed -e 's/^X-R//'`
+- if test "$enable_rpath" != no; then
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $dir"
+- fi
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $dir"
+- fi
+- fi
+- ;;
+- -l*)
+- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+- ;;
+- *.la)
+- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+- ;;
+- *)
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+- ;;
+- esac
+- done
+- fi
+- else
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+- fi
+- fi
+- fi
+- done
+- done
+- if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
+- alldirs=
+- for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+- done
+- acl_save_libdir="$libdir"
+- libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+- else
+- for found_dir in $rpathdirs; do
+- acl_save_libdir="$libdir"
+- libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+- done
+- fi
+- fi
+- if test "X$ltrpathdirs" != "X"; then
+- for found_dir in $ltrpathdirs; do
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+- done
++else
++ for ac_prog in gcc cc
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_BUILD_CC+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$BUILD_CC"; then
++ ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_BUILD_CC="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++BUILD_CC=$ac_cv_prog_BUILD_CC
++if test -n "$BUILD_CC"; then
++ { echo "$as_me:$LINENO: result: $BUILD_CC" >&5
++echo "${ECHO_T}$BUILD_CC" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$BUILD_CC" && break
++done
++
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -7834,2721 +12987,3679 @@ fi
+
+
+
+- ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
+
++for ac_header in dirent.h errno.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-$as_echo "#define ptrdiff_t long" >>confdefs.h
++ ac_header_preproc=no
++fi
++
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+- for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+-stdlib.h string.h unistd.h sys/param.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
done
+- for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
+-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+-__fsetlocking
+-do :
+- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
++
++
++for ac_header in sys/disk.h sys/mount.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++#if HAVE_SYS_QUEUE_H
++#include <sys/queue.h>
++#endif
++
++
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ eval "$as_ac_Header=yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_Header=no"
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+-done
+
++done
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snprintf is declared" >&5
+-$as_echo_n "checking whether _snprintf is declared... " >&6; }
+-if test "${ac_cv_have_decl__snprintf+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++for ac_header in net/if.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
+
+-#ifndef _snprintf
+- char *p = (char *) _snprintf;
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#if HAVE_SYS_SOCKET
++#include <sys/socket.h>
+ #endif
+- ;
+- return 0;
+-}
++
++#include <$ac_header>
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_have_decl__snprintf=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ eval "$as_ac_Header=yes"
+ else
+- ac_cv_have_decl__snprintf=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5
+-$as_echo "$ac_cv_have_decl__snprintf" >&6; }
+- if test $ac_cv_have_decl__snprintf = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL__SNPRINTF $gt_value
++fi
++
++done
++
++
+for ac_header in db.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -235,20 +19827,5173 @@ Index: e2fsprogs-1.41.5/configure
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
++fi
++
++done
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5
+-$as_echo_n "checking whether _snwprintf is declared... " >&6; }
+-if test "${ac_cv_have_decl__snwprintf+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++for ac_func in vprintf
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $ac_func innocuous_$ac_func
+
+-#ifndef _snwprintf
+- char *p = (char *) _snwprintf;
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
+ #endif
+
++int
++main ()
++{
++return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_have_decl__snwprintf=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_var=yes"
+ else
+- ac_cv_have_decl__snwprintf=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_var=no"
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5
+-$as_echo "$ac_cv_have_decl__snwprintf" >&6; }
+- if test $ac_cv_have_decl__snwprintf = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL__SNWPRINTF $gt_value
++{ echo "$as_me:$LINENO: checking for _doprnt" >&5
++echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
++if test "${ac_cv_func__doprnt+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define _doprnt innocuous__doprnt
+
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char _doprnt (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
+
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+
++#undef _doprnt
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char _doprnt ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub__doprnt || defined __stub____doprnt
++choke me
++#endif
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
+-$as_echo_n "checking whether feof_unlocked is declared... " >&6; }
+-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <stdio.h>
+ int
+ main ()
+ {
+-
+-#ifndef feof_unlocked
+- char *p = (char *) feof_unlocked;
+-#endif
+-
++return _doprnt ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_have_decl_feof_unlocked=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_func__doprnt=yes
+ else
+- ac_cv_have_decl_feof_unlocked=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_func__doprnt=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
+-$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
+- if test $ac_cv_have_decl_feof_unlocked = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
++echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
++if test $ac_cv_func__doprnt = yes; then
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_DOPRNT 1
+ _ACEOF
+
++fi
++
++fi
++done
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
+-$as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
+-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for struct dirent.d_reclen" >&5
++echo $ECHO_N "checking for struct dirent.d_reclen... $ECHO_C" >&6; }
++if test "${ac_cv_member_struct_dirent_d_reclen+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdio.h>
++#include <dirent.h>
++
+ int
+ main ()
+ {
+-
+-#ifndef fgets_unlocked
+- char *p = (char *) fgets_unlocked;
+-#endif
+-
++static struct dirent ac_aggr;
++if (ac_aggr.d_reclen)
++return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_have_decl_fgets_unlocked=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_member_struct_dirent_d_reclen=yes
+ else
+- ac_cv_have_decl_fgets_unlocked=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
+-$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
+- if test $ac_cv_have_decl_fgets_unlocked = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5
+-$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
+-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdio.h>
++#include <dirent.h>
++
+ int
+ main ()
+ {
+-
+-#ifndef getc_unlocked
+- char *p = (char *) getc_unlocked;
+-#endif
+-
++static struct dirent ac_aggr;
++if (sizeof ac_aggr.d_reclen)
++return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_have_decl_getc_unlocked=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_member_struct_dirent_d_reclen=yes
+ else
+- ac_cv_have_decl_getc_unlocked=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_member_struct_dirent_d_reclen=no
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5
+-$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
+- if test $ac_cv_have_decl_getc_unlocked = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_GETC_UNLOCKED $gt_value
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_dirent_d_reclen" >&5
++echo "${ECHO_T}$ac_cv_member_struct_dirent_d_reclen" >&6; }
++if test $ac_cv_member_struct_dirent_d_reclen = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_RECLEN_DIRENT 1
+ _ACEOF
+
++fi
+
+-
+- case $gt_cv_func_printf_posix in
+- *yes) HAVE_POSIX_PRINTF=1 ;;
+- *) HAVE_POSIX_PRINTF=0 ;;
+- esac
+-
+- if test "$ac_cv_func_asprintf" = yes; then
+- HAVE_ASPRINTF=1
+- else
+- HAVE_ASPRINTF=0
+- fi
+-
+- if test "$ac_cv_func_snprintf" = yes; then
+- HAVE_SNPRINTF=1
+- else
+- HAVE_SNPRINTF=0
+- fi
+-
+- if test "$ac_cv_func_wprintf" = yes; then
+- HAVE_WPRINTF=1
+- else
+- HAVE_WPRINTF=0
+- fi
+-
+-
+-
+-
+-
+-
+-
+- am_save_CPPFLAGS="$CPPFLAGS"
+-
+- for element in $INCICONV; do
+- haveit=
+- for x in $CPPFLAGS; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X$element"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+- fi
+- done
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+-$as_echo_n "checking for iconv... " >&6; }
+-if test "${am_cv_func_iconv+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for ssize_t" >&5
++echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_ssize_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-
+- am_cv_func_iconv="no, consider installing GNU libiconv"
+- am_cv_lib_iconv=no
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-#include <iconv.h>
+-int
+-main ()
+-{
+-iconv_t cd = iconv_open("","");
+- iconv(cd,NULL,NULL,NULL,NULL);
+- iconv_close(cd);
+- ;
+- return 0;
+-}
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- am_cv_func_iconv=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- if test "$am_cv_func_iconv" != yes; then
+- am_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBICONV"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdlib.h>
+-#include <iconv.h>
++#include <sys/types.h>
++
++typedef ssize_t ac__type_new_;
+ int
+ main ()
+ {
+-iconv_t cd = iconv_open("","");
+- iconv(cd,NULL,NULL,NULL,NULL);
+- iconv_close(cd);
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- LIBS="$am_save_LIBS"
+- fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+-$as_echo "$am_cv_func_iconv" >&6; }
+- if test "$am_cv_func_iconv" = yes; then
+-
+-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+-
+- fi
+- if test "$am_cv_lib_iconv" = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+-$as_echo_n "checking how to link with libiconv... " >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+-$as_echo "$LIBICONV" >&6; }
+- else
+- CPPFLAGS="$am_save_CPPFLAGS"
+- LIBICONV=
+- LTLIBICONV=
+- fi
+-
+-
+-
+- if test "$am_cv_func_iconv" = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+-$as_echo_n "checking for iconv declaration... " >&6; }
+- if test "${am_cv_proto_iconv+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_ssize_t=yes
+ else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ ac_cv_type_ssize_t=no
++fi
+
+-#include <stdlib.h>
+-#include <iconv.h>
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-#if defined(__STDC__) || defined(__cplusplus)
+-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+-#else
+-size_t iconv();
+-#endif
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
++echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
++if test $ac_cv_type_ssize_t = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_TYPE_SSIZE_T 1
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking whether llseek is declared" >&5
++echo $ECHO_N "checking whether llseek is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl_llseek+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <unistd.h>
+
+ int
+ main ()
+ {
++#ifndef llseek
++ (void) llseek;
++#endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- am_cv_proto_iconv_arg1=""
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl_llseek=yes
+ else
+- am_cv_proto_iconv_arg1="const"
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_have_decl_llseek=no
+ fi
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+ fi
+-
+- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+- }$am_cv_proto_iconv" >&5
+-$as_echo "${ac_t:-
+- }$am_cv_proto_iconv" >&6; }
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ICONV_CONST $am_cv_proto_iconv_arg1
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_llseek" >&5
++echo "${ECHO_T}$ac_cv_have_decl_llseek" >&6; }
++if test $ac_cv_have_decl_llseek = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LLSEEK_PROTOTYPE 1
+ _ACEOF
+
+- fi
+-
++fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+-$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+-if test "${am_cv_langinfo_codeset+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking whether lseek64 is declared" >&5
++echo $ECHO_N "checking whether lseek64 is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl_lseek64+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <langinfo.h>
++#define _LARGEFILE_SOURCE
++ #define _LARGEFILE64_SOURCE
++ #include <unistd.h>
++
+ int
+ main ()
+ {
+-char* cs = nl_langinfo(CODESET);
++#ifndef lseek64
++ (void) lseek64;
++#endif
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- am_cv_langinfo_codeset=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl_lseek64=yes
+ else
+- am_cv_langinfo_codeset=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_have_decl_lseek64=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+-$as_echo "$am_cv_langinfo_codeset" >&6; }
+- if test $am_cv_langinfo_codeset = yes; then
+
+-$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+-
+- fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_lseek64" >&5
++echo "${ECHO_T}$ac_cv_have_decl_lseek64" >&6; }
++if test $ac_cv_have_decl_lseek64 = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LSEEK64_PROTOTYPE 1
++_ACEOF
+
+- if test $ac_cv_header_locale_h = yes; then
++fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+-$as_echo_n "checking for LC_MESSAGES... " >&6; }
+-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
++if test "${ac_cv_type_short+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <locale.h>
++$ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-return LC_MESSAGES
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- am_cv_val_LC_MESSAGES=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_short=yes
+ else
+- am_cv_val_LC_MESSAGES=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_type_short=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+- if test $am_cv_val_LC_MESSAGES = yes; then
+
+-$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+
+- fi
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_short+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef short ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 0
+
+- fi
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef short ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
+
+- for ac_prog in bison
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_INTLBISON+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$INTLBISON"; then
+- ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_INTLBISON="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-fi
+-INTLBISON=$ac_cv_prog_INTLBISON
+-if test -n "$INTLBISON"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5
+-$as_echo "$INTLBISON" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+- test -n "$INTLBISON" && break
+-done
+-
+- if test -z "$INTLBISON"; then
+- ac_verc_fail=yes
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5
+-$as_echo_n "checking version of bison... " >&6; }
+- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+- case $ac_prog_version in
+- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+- esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+-$as_echo "$ac_prog_version" >&6; }
+- fi
+- if test $ac_verc_fail = yes; then
+- INTLBISON=:
+- fi
+-
+-
+-
+-
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+-$as_echo_n "checking whether NLS is requested... " >&6; }
+- # Check whether --enable-nls was given.
+-if test "${enable_nls+set}" = set; then :
+- enableval=$enable_nls; USE_NLS=$enableval
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- USE_NLS=yes
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+-$as_echo "$USE_NLS" >&6; }
+-
+-
+-
+-
+- BUILD_INCLUDED_LIBINTL=no
+- USE_INCLUDED_LIBINTL=no
+-
+- LIBINTL=
+- LTLIBINTL=
+- POSUB=
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- if test "$USE_NLS" = "yes"; then
+- gt_use_preinstalled_gnugettext=no
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef short ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 0
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5
+-$as_echo_n "checking whether included gettext is requested... " >&6; }
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef short ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
+
+-# Check whether --with-included-gettext was given.
+-if test "${with_included_gettext+set}" = set; then :
+- withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
+ else
+- nls_cv_force_use_gnu_gettext=no
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5
+-$as_echo "$nls_cv_force_use_gnu_gettext" >&6; }
+-
+- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+-
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo= ac_hi=
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+-$as_echo_n "checking for GNU gettext in libc... " >&6; }
+-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++$ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- gt_cv_func_gnugettext1_libc=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
+ else
+- gt_cv_func_gnugettext1_libc=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5
+-$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
+-
+- if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+-
+-
+-
+- use_additional=yes
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+-
+-# Check whether --with-libintl-prefix was given.
+-if test "${with_libintl_prefix+set}" = set; then :
+- withval=$with_libintl_prefix;
+- if test "X$withval" = "Xno"; then
+- use_additional=no
+- else
+- if test "X$withval" = "X"; then
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- else
+- additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
+- fi
+- fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+
+- LIBINTL=
+- LTLIBINTL=
+- INCINTL=
+- rpathdirs=
+- ltrpathdirs=
+- names_already_handled=
+- names_next_round='intl '
+- while test -n "$names_next_round"; do
+- names_this_round="$names_next_round"
+- names_next_round=
+- for name in $names_this_round; do
+- already_handled=
+- for n in $names_already_handled; do
+- if test "$n" = "$name"; then
+- already_handled=yes
+- break
+- fi
+- done
+- if test -z "$already_handled"; then
+- names_already_handled="$names_already_handled $name"
+- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+- eval value=\"\$HAVE_LIB$uppername\"
+- if test -n "$value"; then
+- if test "$value" = yes; then
+- eval value=\"\$LIB$uppername\"
+- test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+- eval value=\"\$LTLIB$uppername\"
+- test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+- else
+- :
+- fi
+- else
+- found_dir=
+- found_la=
+- found_so=
+- found_a=
+- if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- fi
+- fi
+- fi
+- if test "X$found_dir" = "X"; then
+- for x in $LDFLAGS $LTLIBINTL; do
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_short=$ac_lo;;
++'') if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
++esac
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++ {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
+
+- case "$x" in
+- -L*)
+- dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
+- found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- fi
+- fi
+- ;;
+- esac
+- if test "X$found_dir" != "X"; then
+- break
+- fi
+- done
+- fi
+- if test "X$found_dir" != "X"; then
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+- if test "X$found_so" != "X"; then
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- else
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $found_dir"
+- fi
+- if test "$hardcode_direct" = yes; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- else
+- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $found_dir"
+- fi
+- else
+- haveit=
+- for x in $LDFLAGS $LIBINTL; do
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_sizeof_short=`cat conftest.val`
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++( exit $ac_status )
++if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.val
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+
+- if test "X$x" = "X-L$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+- fi
+- if test "$hardcode_minus_L" != no; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- else
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+- fi
+- fi
+- fi
+- fi
+- else
+- if test "X$found_a" != "X"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+- else
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+- fi
+- fi
+- additional_includedir=
+- case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+- additional_includedir="$basedir/include"
+- ;;
+- esac
+- if test "X$additional_includedir" != "X"; then
+- if test "X$additional_includedir" != "X/usr/include"; then
+- haveit=
+- if test "X$additional_includedir" = "X/usr/local/include"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux*) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- for x in $CPPFLAGS $INCINTL; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X-I$additional_includedir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_includedir"; then
+- INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test -n "$found_la"; then
+- save_libdir="$libdir"
+- case "$found_la" in
+- */* | *\\*) . "$found_la" ;;
+- *) . "./$found_la" ;;
+- esac
+- libdir="$save_libdir"
+- for dep in $dependency_libs; do
+- case "$dep" in
+- -L*)
+- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+- if test "X$additional_libdir" != "X/usr/lib"; then
+- haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux*) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- haveit=
+- for x in $LDFLAGS $LIBINTL; do
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SHORT $ac_cv_sizeof_short
++_ACEOF
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+- fi
+- fi
+- haveit=
+- for x in $LDFLAGS $LTLIBINTL; do
++{ echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
++if test "${ac_cv_type_int+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++typedef int ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_int=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++ ac_cv_type_int=no
++fi
+
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+- fi
+- fi
+- fi
+- fi
+- ;;
+- -R*)
+- dir=`echo "X$dep" | sed -e 's/^X-R//'`
+- if test "$enable_rpath" != no; then
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $dir"
+- fi
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $dir"
+- fi
+- fi
+- ;;
+- -l*)
+- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+- ;;
+- *.la)
+- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+- ;;
+- *)
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+- ;;
+- esac
+- done
+- fi
+- else
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+- fi
+- fi
+- fi
+- done
+- done
+- if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
+- alldirs=
+- for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+- done
+- acl_save_libdir="$libdir"
+- libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+- else
+- for found_dir in $rpathdirs; do
+- acl_save_libdir="$libdir"
+- libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+- done
+- fi
+- fi
+- if test "X$ltrpathdirs" != "X"; then
+- for found_dir in $ltrpathdirs; do
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+- done
+- fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_int+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $INCINTL"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBINTL"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef int ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 0
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias ();
++$ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- gt_cv_func_gnugettext1_libintl=yes
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
+ else
+- gt_cv_func_gnugettext1_libintl=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+- LIBS="$LIBS $LIBICONV"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias ();
++$ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 0
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- LIBINTL="$LIBINTL $LIBICONV"
+- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+- gt_cv_func_gnugettext1_libintl=yes
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- fi
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5
+-$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
+- fi
+-
+- if test "$gt_cv_func_gnugettext1_libc" = "yes" \
+- || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
+- gt_use_preinstalled_gnugettext=yes
+- else
+- LIBINTL=
+- LTLIBINTL=
+- INCINTL=
+- fi
+-
+-
+- if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+- nls_cv_use_gnu_gettext=yes
+- fi
+- fi
+-
+- if test "$nls_cv_use_gnu_gettext" = "yes"; then
+- BUILD_INCLUDED_LIBINTL=yes
+- USE_INCLUDED_LIBINTL=yes
+- LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
+- LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
+- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+- fi
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- CATOBJEXT=.gmo
+- fi
+-
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+-
+-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+-
+- else
+- USE_NLS=no
+- fi
+- fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+-$as_echo_n "checking whether to use NLS... " >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+-$as_echo "$USE_NLS" >&6; }
+- if test "$USE_NLS" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+-$as_echo_n "checking where the gettext function comes from... " >&6; }
+- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- gt_source="external libintl"
+- else
+- gt_source="libc"
+- fi
+- else
+- gt_source="included intl directory"
+- fi
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+-$as_echo "$gt_source" >&6; }
+- fi
+-
+- if test "$USE_NLS" = "yes"; then
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+-$as_echo_n "checking how to link with libintl... " >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+-$as_echo "$LIBINTL" >&6; }
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef int ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
+
+- for element in $INCINTL; do
+- haveit=
+- for x in $CPPFLAGS; do
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
++fi
+
+- if test "X$x" = "X$element"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+- fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- fi
++ ac_lo= ac_hi=
+fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef int ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
+
+-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
+
+-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_int=$ac_lo;;
++'') if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi ;;
++esac
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
+- fi
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++ {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
+
+- POSUB=po
+- fi
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_sizeof_int=`cat conftest.val`
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++( exit $ac_status )
++if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.val
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+
+- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+- BUILD_INCLUDED_LIBINTL=yes
+- fi
+
+
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_INT $ac_cv_sizeof_int
++_ACEOF
+
+
++{ echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++typedef long ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_long=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- nls_cv_header_intl=
+- nls_cv_header_libgt=
++ ac_cv_type_long=no
++fi
+
+- DATADIRNAME=share
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 0
+
+- INSTOBJEXT=.mo
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
+
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- GENCAT=gencat
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- if test "$USE_INCLUDED_LIBINTL" = yes; then
+- INTLOBJS="\$(GETTOBJS)"
+- fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 0
+
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
+
+- INTL_LIBTOOL_SUFFIX_PREFIX=
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- INTLLIBS="$LIBINTL"
++ ac_lo= ac_hi=
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
+
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi ;;
++esac
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++ {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+-set x ${MAKE-make}
+-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.make <<\_ACEOF
+-SHELL = /bin/sh
+-all:
+- @echo '@@@%%%=$(MAKE)=@@@%%%'
++ ;
++ return 0;
++}
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-case `${MAKE-make} -f conftest.make 2>/dev/null` in
+- *@@@%%%=?*=@@@%%%*)
+- eval ac_cv_prog_make_${ac_make}_set=yes;;
+- *)
+- eval ac_cv_prog_make_${ac_make}_set=no;;
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-rm -f conftest.make
+-fi
+-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- SET_MAKE=
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- SET_MAKE="MAKE=${MAKE-make}"
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+-$as_echo_n "checking for GNU make... " >&6; }
+-if test "${_cv_gnu_make_command+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_sizeof_long=`cat conftest.val`
+ else
+- _cv_gnu_make_command='' ;
+- for a in "$MAKE" make gmake gnumake ; do
+- if test -z "$a" ; then continue ; fi ;
+- if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
+- _cv_gnu_make_command=$a ;
+- break;
+- fi
+- done ;
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++( exit $ac_status )
++if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
+-$as_echo "$_cv_gnu_make_command" >&6; } ;
+- if test "x$_cv_gnu_make_command" != "x" ; then
+- ifGNUmake='' ;
+- ifNotGNUmake='#' ;
+- else
+- ifGNUmake='#' ;
+- ifNotGNUmake='' ;
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"Not found\"" >&5
+-$as_echo "\"Not found\"" >&6; };
+- fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.val
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+
+
+
+-# Extract the first word of "ln", so it can be a program name with args.
+-set dummy ln; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LN+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $LN in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_LN="$LN" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
+
+- test -z "$ac_cv_path_LN" && ac_cv_path_LN="ln"
+- ;;
++
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++typedef long long ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-LN=$ac_cv_path_LN
+-if test -n "$LN"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
+-$as_echo "$LN" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_long_long=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_type_long_long=no
++fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+-$as_echo_n "checking whether ln -s works... " >&6; }
+-LN_S=$as_ln_s
+-if test "$LN_S" = "ln -s"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+-$as_echo "no, using $LN_S" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+
+-# Extract the first word of "mv", so it can be a program name with args.
+-set dummy mv; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MV+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of long long" >&5
++echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_long_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $MV in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MV="$MV" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ if test "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 0
+
+- test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv"
+- ;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-MV=$ac_cv_path_MV
+-if test -n "$MV"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
+-$as_echo "$MV" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
+
+-# Extract the first word of "cp", so it can be a program name with args.
+-set dummy cp; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_CP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $CP in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_CP="$CP" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+-IFS=$as_save_IFS
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- test -z "$ac_cv_path_CP" && ac_cv_path_CP="cp"
+- ;;
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 0
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-CP=$ac_cv_path_CP
+-if test -n "$CP"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
+-$as_echo "$CP" >&6; }
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
- for ac_func in vprintf
++ ac_lo= ac_hi=
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
+-# Extract the first word of "rm", so it can be a program name with args.
+-set dummy rm; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_RM+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $RM in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_RM="$RM" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long long ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
+
+- test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm"
+- ;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-RM=$ac_cv_path_RM
+-if test -n "$RM"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+-$as_echo "$RM" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
+
+-# Extract the first word of "chmod", so it can be a program name with args.
+-set dummy chmod; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_CHMOD+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $CHMOD in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+- done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_CHMOD" && ac_cv_path_CHMOD=":"
+- ;;
++case $ac_lo in
++?*) ac_cv_sizeof_long_long=$ac_lo;;
++'') if test "$ac_cv_type_long_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long_long=0
++ fi ;;
+ esac
+-fi
+-CHMOD=$ac_cv_path_CHMOD
+-if test -n "$CHMOD"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
+-$as_echo "$CHMOD" >&6; }
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef long long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++ {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
+
+-for ac_prog in gawk mawk nawk awk
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$AWK"; then
+- ac_cv_prog_AWK="$AWK" # Let the user override the test.
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_sizeof_long_long=`cat conftest.val`
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_AWK="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++( exit $ac_status )
++if test "$ac_cv_type_long_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long_long=0
++ fi
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-AWK=$ac_cv_prog_AWK
+-if test -n "$AWK"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+-$as_echo "$AWK" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++rm -f conftest.val
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
+
+
+- test -n "$AWK" && break
+-done
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+-$as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+- then ac_cv_path_EGREP="$GREP -E"
+- else
+- if test -z "$EGREP"; then
+- ac_path_EGREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_prog in egrep; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+-# Check for GNU ac_path_EGREP and select it if it is found.
+- # Check for GNU $ac_path_EGREP
+-case `"$ac_path_EGREP" --version 2>&1` in
+-*GNU*)
+- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+-*)
+- ac_count=0
+- $as_echo_n 0123456789 >"conftest.in"
+- while :
+- do
+- cat "conftest.in" "conftest.in" >"conftest.tmp"
+- mv "conftest.tmp" "conftest.in"
+- cp "conftest.in" "conftest.nl"
+- $as_echo 'EGREP' >> "conftest.nl"
+- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+- as_fn_arith $ac_count + 1 && ac_count=$as_val
+- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+- # Best one so far, save it but keep looking for a better one
+- ac_cv_path_EGREP="$ac_path_EGREP"
+- ac_path_EGREP_max=$ac_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test $ac_count -gt 10 && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
++_ACEOF
+
+- $ac_path_EGREP_found && break 3
+- done
+- done
+- done
+-IFS=$as_save_IFS
+- if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+- fi
+-else
+- ac_cv_path_EGREP=$EGREP
+-fi
+
+- 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"
++SIZEOF_SHORT=$ac_cv_sizeof_short
++SIZEOF_INT=$ac_cv_sizeof_int
++SIZEOF_LONG=$ac_cv_sizeof_long
++SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+
+
+-# Extract the first word of "sed", so it can be a program name with args.
+-set dummy sed; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $SED in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SED="$SED" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_SED" && ac_cv_path_SED="sed"
+- ;;
+-esac
+-fi
+-SED=$ac_cv_path_SED
+-if test -n "$SED"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+-$as_echo "$SED" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <sys/param.h>
+
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PERL+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $PERL in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++int
++main ()
++{
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
++ bogus endian macros
++#endif
+
+- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
+- ;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-PERL=$ac_cv_path_PERL
+-if test -n "$PERL"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+-$as_echo "$PERL" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <sys/param.h>
+
+-# Extract the first word of "ldconfig", so it can be a program name with args.
+-set dummy ldconfig; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LDCONFIG+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $LDCONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
+
+- test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG=":"
+- ;;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-LDCONFIG=$ac_cv_path_LDCONFIG
+-if test -n "$LDCONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDCONFIG" >&5
+-$as_echo "$LDCONFIG" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_c_bigendian=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_c_bigendian=no
++fi
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$AR"; then
+- ac_cv_prog_AR="$AR" # Let the user override the test.
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_AR="${ac_tool_prefix}ar"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ # It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++ # try to guess the endianness by grepping values into an object file
++ ac_cv_c_bigendian=unknown
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++ ac_cv_c_bigendian=yes
+ fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++ if test "$ac_cv_c_bigendian" = unknown; then
++ ac_cv_c_bigendian=no
++ else
++ # finding both strings is unlikely to happen, but who knows?
++ ac_cv_c_bigendian=unknown
++ fi
+ fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+-$as_echo "$AR" >&6; }
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+-if test -z "$ac_cv_prog_AR"; then
+- ac_ct_AR=$AR
+- # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_AR"; then
+- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_AR="ar"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+
+-fi
+-fi
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+-$as_echo "$ac_ct_AR" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
+
+- if test "x$ac_ct_AR" = x; then
+- AR="ar"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- AR=$ac_ct_AR
+- fi
+-else
+- AR="$ac_cv_prog_AR"
+-fi
++ /* Are we little or big endian? From Harbison&Steele. */
++ union
++ {
++ long int l;
++ char c[sizeof (long int)];
++ } u;
++ u.l = 1;
++ return u.c[sizeof (long int) - 1] == 1;
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$RANLIB"; then
+- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_c_bigendian=no
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++( exit $ac_status )
++ac_cv_c_bigendian=yes
+ fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+-$as_echo "$RANLIB" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+ fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+- ac_ct_RANLIB=$RANLIB
+- # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_RANLIB"; then
+- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_RANLIB="ranlib"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+-$as_echo "$ac_ct_RANLIB" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
++case $ac_cv_c_bigendian in
++ yes)
+
+- if test "x$ac_ct_RANLIB" = x; then
+- RANLIB=":"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
++cat >>confdefs.h <<\_ACEOF
++#define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++ no)
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++ { (exit 1); exit 1; }; } ;;
+ esac
+- RANLIB=$ac_ct_RANLIB
+- fi
+-else
+- RANLIB="$ac_cv_prog_RANLIB"
+-fi
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$STRIP"; then
+- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
++ASM_TYPES_HEADER=./asm_types.h
+
++echo "/* These defines are needed for the public ext2fs.h header file */" \
++ > public_config.h
++if grep HAVE_SYS_TYPES_H confdefs.h > tmp_config.$$; then
++ uniq tmp_config.$$ >> public_config.h
++else
++ echo "#undef HAVE_SYS_TYPES_H" >> public_config.h
+ fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
++if grep WORDS_BIGENDIAN confdefs.h > tmp_config.$$; then
++ uniq tmp_config.$$ >> public_config.h
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ echo "#undef WORDS_BIGENDIAN" >> public_config.h
+ fi
++rm -f tmp_config.$$
++PUBLIC_CONFIG_HEADER=./public_config.h
+
+
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+- ac_ct_STRIP=$STRIP
+- # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_STRIP"; then
+- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
++for ac_header in inttypes.h
do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -15204,6 +15390,284 @@ _ACEOF
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_STRIP="strip"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
+ fi
+
+- if test "x$ac_ct_STRIP" = x; then
+- STRIP=":"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+- STRIP=$ac_ct_STRIP
+- fi
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
+ else
+- STRIP="$ac_cv_prog_STRIP"
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
+ fi
+
+-# Extract the first word of "makeinfo", so it can be a program name with args.
+-set dummy makeinfo; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$MAKEINFO"; then
+- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_MAKEINFO="makeinfo"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++
+ fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
+-$as_echo "$MAKEINFO" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+
++done
+
+-if test "_$MAKEINFO" = "_"; then
+- MAKEINFO="@echo Makeinfo is missing. Info documentation will not be built.;true"
++{ echo "$as_me:$LINENO: checking for intptr_t" >&5
++echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_intptr_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case "$MAKEINFO" in
+- */missing.*)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&5
+-$as_echo "$as_me: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&2;}
+- ;;
+- *)
+- ;;
+- esac
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++typedef intptr_t ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_intptr_t=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_type_intptr_t=no
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
++echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; }
++if test $ac_cv_type_intptr_t = yes; then
+
+-# See if we need a separate native compiler.
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INTPTR_T 1
++_ACEOF
+
++
++fi
++
++{ echo "$as_me:$LINENO: checking whether struct stat has a st_flags field" >&5
++echo $ECHO_N "checking whether struct stat has a st_flags field... $ECHO_C" >&6; }
++if test "${e2fsprogs_cv_struct_st_flags+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- for ac_prog in gcc cc
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$BUILD_CC"; then
+- ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/stat.h>
++int
++main ()
++{
++struct stat stat; stat.st_flags = 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ e2fsprogs_cv_struct_st_flags=yes
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_BUILD_CC="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ e2fsprogs_cv_struct_st_flags=no
+ fi
+-fi
+-BUILD_CC=$ac_cv_prog_BUILD_CC
+-if test -n "$BUILD_CC"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+-$as_echo "$BUILD_CC" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
++{ echo "$as_me:$LINENO: result: $e2fsprogs_cv_struct_st_flags" >&5
++echo "${ECHO_T}$e2fsprogs_cv_struct_st_flags" >&6; }
++if test "$e2fsprogs_cv_struct_st_flags" = yes; then
++ { echo "$as_me:$LINENO: checking whether st_flags field is useful" >&5
++echo $ECHO_N "checking whether st_flags field is useful... $ECHO_C" >&6; }
++ if test "${e2fsprogs_cv_struct_st_flags_immut+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/stat.h>
++int
++main ()
++{
++struct stat stat; stat.st_flags |= UF_IMMUTABLE;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ e2fsprogs_cv_struct_st_flags_immut=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- test -n "$BUILD_CC" && break
+-done
++ e2fsprogs_cv_struct_st_flags_immut=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-for ac_header in dirent.h errno.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++
++ { echo "$as_me:$LINENO: result: $e2fsprogs_cv_struct_st_flags_immut" >&5
++echo "${ECHO_T}$e2fsprogs_cv_struct_st_flags_immut" >&6; }
++ if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_STAT_FLAGS 1
+ _ACEOF
+
++ fi
+ fi
++{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
++echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
++if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++ #include <sys/socket.h>
+
+-done
++int
++main ()
++{
++static struct sockaddr ac_aggr;
++if (ac_aggr.sa_len)
++return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_member_struct_sockaddr_sa_len=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-for ac_header in sys/disk.h sys/mount.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" "
+-#if HAVE_SYS_QUEUE_H
+-#include <sys/queue.h>
+-#endif
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++ #include <sys/socket.h>
+
+-"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++int
++main ()
++{
++static struct sockaddr ac_aggr;
++if (sizeof ac_aggr.sa_len)
++return 0;
++ ;
++ return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_member_struct_sockaddr_sa_len=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_member_struct_sockaddr_sa_len=no
+ fi
+
+-done
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
+-for ac_header in net/if.h
+-do :
+- ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
+-#if HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#if HAVE_SYS_SOCKET
+-#include <sys/socket.h>
+-#endif
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
++if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+
+-"
+-if test "x$ac_cv_header_net_if_h" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_NET_IF_H 1
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SA_LEN 1
+ _ACEOF
+
+ fi
+
+-done
+-
+-for ac_func in vprintf
+-do :
+- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+-if test "x$ac_cv_func_vprintf" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_VPRINTF 1
++if test -n "$BLKID_CMT"; then
++ { echo "$as_me:$LINENO: checking for library containing blkid_probe_all" >&5
++echo $ECHO_N "checking for library containing blkid_probe_all... $ECHO_C" >&6; }
++if test "${ac_cv_search_blkid_probe_all+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+-if test "x$ac_cv_func__doprnt" = x""yes; then :
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char blkid_probe_all ();
++int
++main ()
++{
++return blkid_probe_all ();
++ ;
++ return 0;
++}
++_ACEOF
++for ac_lib in '' blkid; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_search_blkid_probe_all=$ac_res
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
+
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext
++ if test "${ac_cv_search_blkid_probe_all+set}" = set; then
++ break
+ fi
+ done
+-
+-
+-ac_fn_c_check_member "$LINENO" "struct dirent" "d_reclen" "ac_cv_member_struct_dirent_d_reclen" "#include <dirent.h>
+-"
+-if test "x$ac_cv_member_struct_dirent_d_reclen" = x""yes; then :
+- $as_echo "#define HAVE_RECLEN_DIRENT 1" >>confdefs.h
+-
++if test "${ac_cv_search_blkid_probe_all+set}" = set; then
++ :
++else
++ ac_cv_search_blkid_probe_all=no
+ fi
+-
+-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "#include <sys/types.h>
+-"
+-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+- $as_echo "#define HAVE_TYPE_SSIZE_T 1" >>confdefs.h
+-
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
+ fi
+-
+-ac_fn_c_check_decl "$LINENO" "llseek" "ac_cv_have_decl_llseek" "#include <unistd.h>
+-"
+-if test "x$ac_cv_have_decl_llseek" = x""yes; then :
+- $as_echo "#define HAVE_LLSEEK_PROTOTYPE 1" >>confdefs.h
++{ echo "$as_me:$LINENO: result: $ac_cv_search_blkid_probe_all" >&5
++echo "${ECHO_T}$ac_cv_search_blkid_probe_all" >&6; }
++ac_res=$ac_cv_search_blkid_probe_all
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+-ac_fn_c_check_decl "$LINENO" "lseek64" "ac_cv_have_decl_lseek64" "#define _LARGEFILE_SOURCE
+- #define _LARGEFILE64_SOURCE
+- #include <unistd.h>
+-"
+-if test "x$ac_cv_have_decl_lseek64" = x""yes; then :
+- $as_echo "#define HAVE_LSEEK64_PROTOTYPE 1" >>confdefs.h
+-
+ fi
+
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+-$as_echo_n "checking size of short... " >&6; }
+-if test "${ac_cv_sizeof_short+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
+-
+-else
+- if test "$ac_cv_type_short" = yes; then
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (short)
+-See \`config.log' for more details." "$LINENO" 5; }; }
+- else
+- ac_cv_sizeof_short=0
+- fi
+-fi
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+-$as_echo "$ac_cv_sizeof_short" >&6; }
+
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SHORT $ac_cv_sizeof_short
+-_ACEOF
+
+
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+-$as_echo_n "checking size of int... " >&6; }
+-if test "${ac_cv_sizeof_int+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
+
+-else
+- if test "$ac_cv_type_int" = yes; then
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (int)
+-See \`config.log' for more details." "$LINENO" 5; }; }
+- else
+- ac_cv_sizeof_int=0
+- fi
+-fi
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+-$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_INT $ac_cv_sizeof_int
+-_ACEOF
+
+
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+-$as_echo_n "checking size of long... " >&6; }
+-if test "${ac_cv_sizeof_long+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+
+-else
+- if test "$ac_cv_type_long" = yes; then
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (long)
+-See \`config.log' for more details." "$LINENO" 5; }; }
+- else
+- ac_cv_sizeof_long=0
+- fi
+-fi
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+-$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
+-_ACEOF
+
+
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+-$as_echo_n "checking size of long long... " >&6; }
+-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
+
+-else
+- if test "$ac_cv_type_long_long" = yes; then
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (long long)
+-See \`config.log' for more details." "$LINENO" 5; }; }
+- else
+- ac_cv_sizeof_long_long=0
+- fi
+-fi
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+-_ACEOF
+
+
+-SIZEOF_SHORT=$ac_cv_sizeof_short
+-SIZEOF_INT=$ac_cv_sizeof_int
+-SIZEOF_LONG=$ac_cv_sizeof_long
+-SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+
+
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if test "${ac_cv_c_bigendian+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_c_bigendian=unknown
+- # See if we're dealing with a universal compiler.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifndef __APPLE_CC__
+- not a universal capable compiler
+- #endif
+- typedef int dummy;
+-
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+- # Check for potential -arch flags. It is not universal unless
+- # there are at least two -arch flags with different values.
+- ac_arch=
+- ac_prev=
+- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+- if test -n "$ac_prev"; then
+- case $ac_word in
+- i?86 | x86_64 | ppc | ppc64)
+- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+- ac_arch=$ac_word
+- else
+- ac_cv_c_bigendian=universal
+- break
+- fi
+- ;;
+- esac
+- ac_prev=
+- elif test "x$ac_word" = "x-arch"; then
+- ac_prev=arch
+- fi
+- done
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test $ac_cv_c_bigendian = unknown; then
+- # See if sys/param.h defines the BYTE_ORDER macro.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <sys/types.h>
+- #include <sys/param.h>
+
+-int
+-main ()
+-{
+-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+- && LITTLE_ENDIAN)
+- bogus endian macros
+- #endif
+
+- ;
+- return 0;
+-}
++for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- # It does; now see whether it defined to BIG_ENDIAN or not.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <sys/types.h>
+- #include <sys/param.h>
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $ac_func innocuous_$ac_func
+
+-int
+-main ()
+-{
+-#if BYTE_ORDER != BIG_ENDIAN
+- not big endian
+- #endif
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_c_bigendian=yes
+-else
+- ac_cv_c_bigendian=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test $ac_cv_c_bigendian = unknown; then
+- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <limits.h>
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+
+-int
+-main ()
+-{
+-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+- bogus endian macros
+- #endif
++#undef $ac_func
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- # It does; now see whether it defined to _BIG_ENDIAN or not.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <limits.h>
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
+
+ int
+ main ()
+ {
+-#ifndef _BIG_ENDIAN
+- not big endian
+- #endif
+-
++return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ac_cv_c_bigendian=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_var=yes"
+ else
+- ac_cv_c_bigendian=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_var=no"
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test $ac_cv_c_bigendian = unknown; then
+- # Compile a test program.
+- if test "$cross_compiling" = yes; then :
+- # Try to guess by grepping values from an object file.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-short int ascii_mm[] =
+- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+- short int ascii_ii[] =
+- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+- int use_ascii (int i) {
+- return ascii_mm[i] + ascii_ii[i];
+- }
+- short int ebcdic_ii[] =
+- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+- short int ebcdic_mm[] =
+- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+- int use_ebcdic (int i) {
+- return ebcdic_mm[i] + ebcdic_ii[i];
+- }
+- extern int foo;
+
+-int
+-main ()
+-{
+-return use_ascii (foo) == use_ebcdic (foo);
+- ;
+- return 0;
+-}
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+- ac_cv_c_bigendian=yes
+- fi
+- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+- if test "$ac_cv_c_bigendian" = unknown; then
+- ac_cv_c_bigendian=no
+- else
+- # finding both strings is unlikely to happen, but who knows?
+- ac_cv_c_bigendian=unknown
+- fi
+- fi
++
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++SOCKET_LIB=''
++{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
++echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
++if test "${ac_cv_lib_socket_socket+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char socket ();
+ int
+ main ()
+ {
+-
+- /* Are we little or big endian? From Harbison&Steele. */
+- union
+- {
+- long int l;
+- char c[sizeof (long int)];
+- } u;
+- u.l = 1;
+- return u.c[sizeof (long int) - 1] == 1;
+-
++return socket ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- ac_cv_c_bigendian=no
+-else
+- ac_cv_c_bigendian=yes
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+- fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+-$as_echo "$ac_cv_c_bigendian" >&6; }
+- case $ac_cv_c_bigendian in #(
+- yes)
+- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+-;; #(
+- no)
+- ;; #(
+- universal)
+-
+-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+-
+- ;; #(
+- *)
+- as_fn_error "unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+- esac
+-
+-BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
+-ASM_TYPES_HEADER=./asm_types.h
+-
+-echo "/* These defines are needed for the public ext2fs.h header file */" \
+- > public_config.h
+-if grep HAVE_SYS_TYPES_H confdefs.h > tmp_config.$$; then
+- uniq tmp_config.$$ >> public_config.h
+-else
+- echo "#undef HAVE_SYS_TYPES_H" >> public_config.h
+-fi
+-if grep WORDS_BIGENDIAN confdefs.h > tmp_config.$$; then
+- uniq tmp_config.$$ >> public_config.h
+-else
+- echo "#undef WORDS_BIGENDIAN" >> public_config.h
+-fi
+-rm -f tmp_config.$$
+-PUBLIC_CONFIG_HEADER=./public_config.h
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_socket_socket=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-for ac_header in inttypes.h
+-do :
+- ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+-if test "x$ac_cv_header_inttypes_h" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_INTTYPES_H 1
+-_ACEOF
++ ac_cv_lib_socket_socket=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
++if test $ac_cv_lib_socket_socket = yes; then
++ SOCKET_LIB=-lsocket
fi
+-done
+-ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+-if test "x$ac_cv_type_intptr_t" = x""yes; then :
+DB_LIB=''
+{ echo "$as_me:$LINENO: checking for db_env_create in -ldb-4.1" >&5
+echo $ECHO_N "checking for db_env_create in -ldb-4.1... $ECHO_C" >&6; }
@@ -263,7 +25008,9 @@ Index: e2fsprogs-1.41.5/configure
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-+
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INTPTR_T 1
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -278,7 +25025,7 @@ Index: e2fsprogs-1.41.5/configure
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
@@ -304,7 +25051,7 @@ Index: e2fsprogs-1.41.5/configure
+
+ ac_cv_lib_db_4_1_db_env_create=no
+fi
-+
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
@@ -316,14 +25063,19 @@ Index: e2fsprogs-1.41.5/configure
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DB 1
+_ACEOF
-+
-+fi
-+
+
+ fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct stat has a st_flags field" >&5
+-$as_echo_n "checking whether struct stat has a st_flags field... " >&6; }
+-if test "${e2fsprogs_cv_struct_st_flags+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for db_env_create in -ldb-4.2" >&5
+echo $ECHO_N "checking for db_env_create in -ldb-4.2... $ECHO_C" >&6; }
+if test "${ac_cv_lib_db_4_2_db_env_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb-4.2 $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
@@ -331,7 +25083,8 @@ Index: e2fsprogs-1.41.5/configure
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-#include <sys/stat.h>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
@@ -340,14 +25093,17 @@ Index: e2fsprogs-1.41.5/configure
+extern "C"
+#endif
+char db_env_create ();
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-struct stat stat; stat.st_flags = 0;
+return db_env_create ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- e2fsprogs_cv_struct_st_flags=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
@@ -367,17 +25123,19 @@ Index: e2fsprogs-1.41.5/configure
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_db_4_2_db_env_create=yes
-+else
+ else
+- e2fsprogs_cv_struct_st_flags=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_db_4_2_db_env_create=no
-+fi
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_2_db_env_create" >&5
+echo "${ECHO_T}$ac_cv_lib_db_4_2_db_env_create" >&6; }
+if test $ac_cv_lib_db_4_2_db_env_create = yes; then
@@ -385,14 +25143,22 @@ Index: e2fsprogs-1.41.5/configure
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DB 1
+_ACEOF
-+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $e2fsprogs_cv_struct_st_flags" >&5
+-$as_echo "$e2fsprogs_cv_struct_st_flags" >&6; }
+-if test "$e2fsprogs_cv_struct_st_flags" = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether st_flags field is useful" >&5
+-$as_echo_n "checking whether st_flags field is useful... " >&6; }
+- if test "${e2fsprogs_cv_struct_st_flags_immut+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+fi
+
+{ echo "$as_me:$LINENO: checking for db_env_create in -ldb-4.3" >&5
+echo $ECHO_N "checking for db_env_create in -ldb-4.3... $ECHO_C" >&6; }
+if test "${ac_cv_lib_db_4_3_db_env_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb-4.3 $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
@@ -400,7 +25166,8 @@ Index: e2fsprogs-1.41.5/configure
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-#include <sys/stat.h>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
@@ -409,14 +25176,17 @@ Index: e2fsprogs-1.41.5/configure
+extern "C"
+#endif
+char db_env_create ();
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-struct stat stat; stat.st_flags |= UF_IMMUTABLE;
+return db_env_create ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- e2fsprogs_cv_struct_st_flags_immut=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
@@ -436,13 +25206,29 @@ Index: e2fsprogs-1.41.5/configure
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_db_4_3_db_env_create=yes
-+else
+ else
+- e2fsprogs_cv_struct_st_flags_immut=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $e2fsprogs_cv_struct_st_flags_immut" >&5
+-$as_echo "$e2fsprogs_cv_struct_st_flags_immut" >&6; }
+- if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
+- $as_echo "#define HAVE_STAT_FLAGS 1" >>confdefs.h
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+- fi
+ ac_cv_lib_db_4_3_db_env_create=no
-+fi
-+
+ fi
+-ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h>
+- #include <sys/socket.h>
+-"
+-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_SA_LEN 1
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
@@ -453,23 +25239,281 @@ Index: e2fsprogs-1.41.5/configure
+ DB_LIB=-ldb-4.3
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DB 1
+ _ACEOF
+
+ fi
+
+-if test -n "$BLKID_CMT"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing blkid_probe_all" >&5
+-$as_echo_n "checking for library containing blkid_probe_all... " >&6; }
+-if test "${ac_cv_search_blkid_probe_all+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for db_env_create in -ldb-4.5" >&5
++echo $ECHO_N "checking for db_env_create in -ldb-4.5... $ECHO_C" >&6; }
++if test "${ac_cv_lib_db_4_5_db_env_create+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldb-4.5 $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+_ACEOF
-+
-+fi
-+
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10557,70 +16668,67 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char blkid_probe_all ();
++char db_env_create ();
+ int
+ main ()
+ {
+-return blkid_probe_all ();
++return db_env_create ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' blkid; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_search_blkid_probe_all=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext
+- if test "${ac_cv_search_blkid_probe_all+set}" = set; then :
+- break
+-fi
+-done
+-if test "${ac_cv_search_blkid_probe_all+set}" = set; then :
+-
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_db_4_5_db_env_create=yes
+ else
+- ac_cv_search_blkid_probe_all=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_blkid_probe_all" >&5
+-$as_echo "$ac_cv_search_blkid_probe_all" >&6; }
+-ac_res=$ac_cv_search_blkid_probe_all
+-if test "$ac_res" != no; then :
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_lib_db_4_5_db_env_create=no
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology
+-do :
+- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_5_db_env_create" >&5
++echo "${ECHO_T}$ac_cv_lib_db_4_5_db_env_create" >&6; }
++if test $ac_cv_lib_db_4_5_db_env_create = yes; then
++ DB_LIB=-ldb-4.5
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_DB 1
+ _ACEOF
+
+ fi
+-done
+
+-SOCKET_LIB=''
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+-$as_echo_n "checking for socket in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_socket+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for db_env_create in -ldb-4.6" >&5
+echo $ECHO_N "checking for db_env_create in -ldb-4.6... $ECHO_C" >&6; }
+if test "${ac_cv_lib_db_4_6_db_env_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+LIBS="-ldb-4.6 $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10629,43 +16737,72 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char socket ();
++char db_env_create ();
+ int
+ main ()
+ {
+-return socket ();
++return db_env_create ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_socket_socket=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_db_4_6_db_env_create=yes
+ else
+- ac_cv_lib_socket_socket=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_db_4_6_db_env_create=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+-$as_echo "$ac_cv_lib_socket_socket" >&6; }
+-if test "x$ac_cv_lib_socket_socket" = x""yes; then :
+- SOCKET_LIB=-lsocket
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_6_db_env_create" >&5
++echo "${ECHO_T}$ac_cv_lib_db_4_6_db_env_create" >&6; }
++if test $ac_cv_lib_db_4_6_db_env_create = yes; then
++ DB_LIB=-ldb-4.6
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_DB 1
++_ACEOF
++
+ fi
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for optreset" >&5
+-$as_echo_n "checking for optreset... " >&6; }
+-if test "${ac_cv_have_optreset+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for optreset" >&5
++echo $ECHO_N "checking for optreset... $ECHO_C" >&6; }
++if test "${ac_cv_have_optreset+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <unistd.h>
+
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "optreset" >/dev/null 2>&1; then :
++ $EGREP "optreset" >/dev/null 2>&1; then
+ ac_cv_have_optreset=yes
+ else
+ ac_cv_have_optreset=no
+@@ -10673,25 +16810,111 @@ fi
+ rm -f conftest*
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_optreset" >&5
+-$as_echo "$ac_cv_have_optreset" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_optreset" >&5
++echo "${ECHO_T}$ac_cv_have_optreset" >&6; }
+ if test $ac_cv_have_optreset = yes; then
+- $as_echo "#define HAVE_OPTRESET 1" >>confdefs.h
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_OPTRESET 1
++_ACEOF
+
+ fi
+ SEM_INIT_LIB=''
+-ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init"
+-if test "x$ac_cv_func_sem_init" = x""yes; then :
++{ echo "$as_me:$LINENO: checking for sem_init" >&5
++echo $ECHO_N "checking for sem_init... $ECHO_C" >&6; }
++if test "${ac_cv_func_sem_init+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
++/* Define sem_init to an innocuous variant, in case <limits.h> declares sem_init.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define sem_init innocuous_sem_init
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char sem_init (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef sem_init
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
@@ -477,11 +25521,18 @@ Index: e2fsprogs-1.41.5/configure
+#ifdef __cplusplus
+extern "C"
+#endif
-+char db_env_create ();
++char sem_init ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_sem_init || defined __stub___sem_init
++choke me
++#endif
++
+int
+main ()
+{
-+return db_env_create ();
++return sem_init ();
+ ;
+ return 0;
+}
@@ -504,75 +25555,1987 @@ Index: e2fsprogs-1.41.5/configure
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_lib_db_4_6_db_env_create=yes
++ ac_cv_func_sem_init=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
-+ ac_cv_lib_db_4_6_db_env_create=no
++ ac_cv_func_sem_init=no
+fi
-+
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_6_db_env_create" >&5
-+echo "${ECHO_T}$ac_cv_lib_db_4_6_db_env_create" >&6; }
-+if test $ac_cv_lib_db_4_6_db_env_create = yes; then
-+ DB_LIB=-ldb-4.6
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DB 1
++{ echo "$as_me:$LINENO: result: $ac_cv_func_sem_init" >&5
++echo "${ECHO_T}$ac_cv_func_sem_init" >&6; }
++if test $ac_cv_func_sem_init = yes; then
++ :
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lpthread" >&5
+-$as_echo_n "checking for sem_init in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_sem_init+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for sem_init in -lpthread" >&5
++echo $ECHO_N "checking for sem_init in -lpthread... $ECHO_C" >&6; }
++if test "${ac_cv_lib_pthread_sem_init+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10709,30 +16932,57 @@ return sem_init ();
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_pthread_sem_init=yes
+ else
+- ac_cv_lib_pthread_sem_init=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_pthread_sem_init=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_sem_init" >&5
+-$as_echo "$ac_cv_lib_pthread_sem_init" >&6; }
+-if test "x$ac_cv_lib_pthread_sem_init" = x""yes; then :
+- $as_echo "#define HAVE_SEM_INIT 1" >>confdefs.h
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_sem_init" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_sem_init" >&6; }
++if test $ac_cv_lib_pthread_sem_init = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_SEM_INIT 1
++_ACEOF
+
+ SEM_INIT_LIB=-lpthread
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lrt" >&5
+-$as_echo_n "checking for sem_init in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_sem_init+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for sem_init in -lrt" >&5
++echo $ECHO_N "checking for sem_init in -lrt... $ECHO_C" >&6; }
++if test "${ac_cv_lib_rt_sem_init+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10750,30 +17000,57 @@ return sem_init ();
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_rt_sem_init=yes
+ else
+- ac_cv_lib_rt_sem_init=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_rt_sem_init=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sem_init" >&5
+-$as_echo "$ac_cv_lib_rt_sem_init" >&6; }
+-if test "x$ac_cv_lib_rt_sem_init" = x""yes; then :
+- $as_echo "#define HAVE_SEM_INIT 1" >>confdefs.h
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sem_init" >&5
++echo "${ECHO_T}$ac_cv_lib_rt_sem_init" >&6; }
++if test $ac_cv_lib_rt_sem_init = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_SEM_INIT 1
++_ACEOF
+
+ SEM_INIT_LIB=-lrt
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lposix4" >&5
+-$as_echo_n "checking for sem_init in -lposix4... " >&6; }
+-if test "${ac_cv_lib_posix4_sem_init+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ { echo "$as_me:$LINENO: checking for sem_init in -lposix4" >&5
++echo $ECHO_N "checking for sem_init in -lposix4... $ECHO_C" >&6; }
++if test "${ac_cv_lib_posix4_sem_init+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix4 $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -10791,19 +17068,42 @@ return sem_init ();
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_posix4_sem_init=yes
+ else
+- ac_cv_lib_posix4_sem_init=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_posix4_sem_init=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sem_init" >&5
+-$as_echo "$ac_cv_lib_posix4_sem_init" >&6; }
+-if test "x$ac_cv_lib_posix4_sem_init" = x""yes; then :
+- $as_echo "#define HAVE_SEM_INIT 1" >>confdefs.h
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sem_init" >&5
++echo "${ECHO_T}$ac_cv_lib_posix4_sem_init" >&6; }
++if test $ac_cv_lib_posix4_sem_init = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_SEM_INIT 1
++_ACEOF
+
+ SEM_INIT_LIB=-lposix4
+ fi
+@@ -10814,19 +17114,21 @@ fi
+
+ fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unified diff option" >&5
+-$as_echo_n "checking for unified diff option... " >&6; }
++{ echo "$as_me:$LINENO: checking for unified diff option" >&5
++echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
+ if diff -u $0 $0 > /dev/null 2>&1 ; then
+ UNI_DIFF_OPTS=-u
+ else
+ UNI_DIFF_OPTS=-c
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNI_DIFF_OPTS" >&5
+-$as_echo "$UNI_DIFF_OPTS" >&6; }
++{ echo "$as_me:$LINENO: result: $UNI_DIFF_OPTS" >&5
++echo "${ECHO_T}$UNI_DIFF_OPTS" >&6; }
+
+ case "$host_os" in
+ linux*)
+- $as_echo "#define HAVE_EXT2_IOCTLS 1" >>confdefs.h
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_EXT2_IOCTLS 1
++_ACEOF
+
+ ;;
+ esac
+@@ -10849,8 +17151,8 @@ case "$host_os" in
+ linux* | gnu* | k*bsd*-gnu)
+ if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
+ root_prefix="";
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: On $host_os systems, root_prefix defaults to ''" >&5
+-$as_echo "On $host_os systems, root_prefix defaults to ''" >&6; }
++ { echo "$as_me:$LINENO: result: On $host_os systems, root_prefix defaults to ''" >&5
++echo "${ECHO_T}On $host_os systems, root_prefix defaults to ''" >&6; }
+ fi
+ ;;
+ esac
+@@ -10858,11 +17160,11 @@ case "$host_os" in
+ linux* | gnu* | k*bsd*-gnu)
+ if test "$prefix" = NONE ; then
+ prefix="/usr";
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: On $host_os systems, prefix defaults to /usr" >&5
+-$as_echo "On $host_os systems, prefix defaults to /usr" >&6; }
++ { echo "$as_me:$LINENO: result: On $host_os systems, prefix defaults to /usr" >&5
++echo "${ECHO_T}On $host_os systems, prefix defaults to /usr" >&6; }
+ if test "$mandir" = '${prefix}/man' ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...and mandir defaults to /usr/share/man" >&5
+-$as_echo "...and mandir defaults to /usr/share/man" >&6; }
++ { echo "$as_me:$LINENO: result: ...and mandir defaults to /usr/share/man" >&5
++echo "${ECHO_T}...and mandir defaults to /usr/share/man" >&6; }
+ mandir=/usr/share/man
+ fi
+ fi
+@@ -10886,36 +17188,40 @@ else
+ fi
+ if test "$bindir" != '${exec_prefix}/bin'; then
+ root_bindir=$bindir
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_bindir to $root_bindir" >&5
+-$as_echo "Setting root_bindir to $root_bindir" >&6; }
++ { echo "$as_me:$LINENO: result: Setting root_bindir to $root_bindir" >&5
++echo "${ECHO_T}Setting root_bindir to $root_bindir" >&6; }
+ fi
+ if test "$sbindir" != '${exec_prefix}/sbin'; then
+ root_sbindir=$sbindir
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_sbindir to $root_sbindir" >&5
+-$as_echo "Setting root_sbindir to $root_sbindir" >&6; }
++ { echo "$as_me:$LINENO: result: Setting root_sbindir to $root_sbindir" >&5
++echo "${ECHO_T}Setting root_sbindir to $root_sbindir" >&6; }
+ fi
+ if test "$libdir" != '${exec_prefix}/lib'; then
+ root_libdir=$libdir
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_libdir to $root_libdir" >&5
+-$as_echo "Setting root_libdir to $root_libdir" >&6; }
++ { echo "$as_me:$LINENO: result: Setting root_libdir to $root_libdir" >&5
++echo "${ECHO_T}Setting root_libdir to $root_libdir" >&6; }
+ fi
+ if test "$sysconfdir" != '${prefix}/etc'; then
+ root_sysconfdir=$sysconfdir
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_sysconfdir to $root_sysconfdir" >&5
+-$as_echo "Setting root_sysconfdir to $root_sysconfdir" >&6; }
++ { echo "$as_me:$LINENO: result: Setting root_sysconfdir to $root_sysconfdir" >&5
++echo "${ECHO_T}Setting root_sysconfdir to $root_sysconfdir" >&6; }
+ fi
+
+
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linker accepts -static" >&5
+-$as_echo_n "checking whether linker accepts -static... " >&6; }
+-if test "${ac_cv_e2fsprogs_use_static+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking whether linker accepts -static" >&5
++echo $ECHO_N "checking whether linker accepts -static... $ECHO_C" >&6; }
++if test "${ac_cv_e2fsprogs_use_static+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <stdio.h>
+ int
+@@ -10926,13 +17232,34 @@ fflush(stdout);
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_e2fsprogs_use_static=yes
+ else
+- ac_cv_e2fsprogs_use_static=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_e2fsprogs_use_static=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$SAVE_LDFLAGS
+ fi
+
+@@ -10941,8 +17268,8 @@ solaris2.*)
+ ac_cv_e2fsprogs_use_static=no
+ ;;
+ esac
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_e2fsprogs_use_static" >&5
+-$as_echo "$ac_cv_e2fsprogs_use_static" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_e2fsprogs_use_static" >&5
++echo "${ECHO_T}$ac_cv_e2fsprogs_use_static" >&6; }
+ LDFLAG_STATIC=
+ if test $ac_cv_e2fsprogs_use_static = yes; then
+ LDFLAG_STATIC=-static
+@@ -10950,9 +17277,11 @@ fi
+
+ case "$host_os" in
+ darwin*)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Apple Darwin / GNU libintl workaround" >&5
+-$as_echo "Using Apple Darwin / GNU libintl workaround" >&6; }
+- $as_echo "#define _INTL_REDIRECT_MACROS 1" >>confdefs.h
++ { echo "$as_me:$LINENO: result: Using Apple Darwin / GNU libintl workaround" >&5
++echo "${ECHO_T}Using Apple Darwin / GNU libintl workaround" >&6; }
++ cat >>confdefs.h <<\_ACEOF
++#define _INTL_REDIRECT_MACROS 1
++_ACEOF
+
+ ;;
+ esac
+@@ -11029,13 +17358,12 @@ _ACEOF
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+- *) { eval $ac_var=; unset $ac_var;} ;;
++ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+@@ -11043,8 +17371,8 @@ $as_echo "$as_me: WARNING: cache variabl
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+- # `set' does not quote correctly, so add quotes: double-quote
+- # substitution turns \\\\ into \\, and sed turns \\ into \.
++ # `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"
+@@ -11067,12 +17395,12 @@ $as_echo "$as_me: WARNING: cache variabl
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+-$as_echo "$as_me: updating cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+ fi
+ rm -f confcache
+@@ -11089,12 +17417,6 @@ test "x$exec_prefix" = xNONE && exec_pre
+ # take arguments), then branch to the quote section. Otherwise,
+ # look for a macro that doesn't take arguments.
+ ac_script='
+-:mline
+-/\\$/{
+- N
+- s,\\\n,,
+- b mline
+-}
+ t clear
+ :clear
+ s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
+@@ -11124,11 +17446,11 @@ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++ ac_i=`echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+
+@@ -11136,15 +17458,12 @@ LTLIBOBJS=$ac_ltlibobjs
+
+
+
+-
+ : ${CONFIG_STATUS=./config.status}
+-ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-as_write_fail=0
+-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -11154,79 +17473,59 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
+-
+ SHELL=\${CONFIG_SHELL-$SHELL}
+-export SHELL
+-_ASEOF
+-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+-## -------------------- ##
+-## M4sh Initialization. ##
+-## -------------------- ##
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++## --------------------- ##
++## M4sh Initialization. ##
++## --------------------- ##
+
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in #(
+- *posix*) :
+- set -o posix ;; #(
+- *) :
+- ;;
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
+ esac
++
+ fi
+
+
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-# Prefer a ksh shell builtin over an external printf program on Solaris,
+-# but without wasting forks for bash or zsh.
+-if test -z "$BASH_VERSION$ZSH_VERSION" \
+- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+- as_echo='print -r --'
+- as_echo_n='print -rn --'
+-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
+- 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'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in #(
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
+- export as_echo_body
+- as_echo='sh -c $as_echo_body as_echo'
+-fi
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++ as_unset=unset
++else
++ as_unset=false
+ fi
+
+
+@@ -11235,18 +17534,20 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
++as_nl='
++'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-case $0 in #((
++case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+- done
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -11257,111 +17558,32 @@ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+- exit 1
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
+ fi
+
+-# 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
+-# trigger a bug in pdksh 5.2.14.
+-for as_var in BASH_ENV ENV MAIL MAILPATH
+-do eval test x\${$as_var+set} = xset \
+- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++# Work around bugs in pre-3.0 UWIN ksh.
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
+-
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
+-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
+-as_fn_error ()
+-{
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+- fi
+- $as_echo "$as_me: error: $1" >&2
+- as_fn_exit $as_status
+-} # as_fn_error
+-
+-
+-# as_fn_set_status STATUS
+-# -----------------------
+-# Set $? to STATUS, without forking.
+-as_fn_set_status ()
+-{
+- return $1
+-} # as_fn_set_status
+-
+-# as_fn_exit STATUS
+-# -----------------
+-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+-as_fn_exit ()
+-{
+- set +e
+- as_fn_set_status $1
+- exit $1
+-} # as_fn_exit
+-
+-# as_fn_unset VAR
+-# ---------------
+-# Portably unset VAR.
+-as_fn_unset ()
+-{
+- { eval $1=; unset $1;}
+-}
+-as_unset=as_fn_unset
+-# as_fn_append VAR VALUE
+-# ----------------------
+-# Append the text in VALUE to the end of the definition contained in VAR. Take
+-# advantage of any shell optimizations that allow amortized linear growth over
+-# repeated appends, instead of the typical quadratic growth present in naive
+-# implementations.
+-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+- eval 'as_fn_append ()
+- {
+- eval $1+=\$2
+- }'
+-else
+- as_fn_append ()
+- {
+- eval $1=\$$1\$2
+- }
+-fi # as_fn_append
+-
+-# as_fn_arith ARG...
+-# ------------------
+-# Perform arithmetic evaluation on the ARGs, and store the result in the
+-# global $as_val. Take advantage of shells that can avoid forks. The arguments
+-# must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+- eval 'as_fn_arith ()
+- {
+- as_val=$(( $* ))
+- }'
+-else
+- as_fn_arith ()
+- {
+- as_val=`expr "$@" || test $? -eq 1`
+- }
+-fi # as_fn_arith
+-
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
++do
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ fi
++done
+
++# Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+@@ -11375,17 +17597,13 @@ else
+ as_basename=false
+ fi
+
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+- as_dirname=dirname
+-else
+- as_dirname=false
+-fi
+
++# Name of the executable.
+ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+@@ -11400,103 +17618,104 @@ $as_echo X/"$0" |
+ }
+ s/.*/./; q'`
+
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++# CDPATH.
++$as_unset CDPATH
++
++
++
++ as_lineno_1=$LINENO
++ as_lineno_2=$LINENO
++ test "x$as_lineno_1" != "x$as_lineno_2" &&
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
++
++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++ # uniformly replaced by the line number. The first 'sed' inserts a
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
++ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
++ N
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
++ t loop
++ s/-\n.*//
++ ' >$as_me.lineno &&
++ chmod +x "$as_me.lineno" ||
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++ { (exit 1); exit 1; }; }
++
++ # Don't try to exec as it changes $[0], causing all sort of problems
++ # (the dirname of $[0] is not the place where we might find the
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
++ # Exit status is that of the last command.
++ exit
++}
++
+
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
+
+ ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in #(((((
++case `echo -n x` in
+ -n*)
+- case `echo 'xy\c'` in
++ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+- xy) ECHO_C='\c';;
+- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+- ECHO_T=' ';;
++ *) ECHO_C='\c';;
+ esac;;
+ *)
+ ECHO_N='-n';;
+ esac
+
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
++ as_expr=expr
++else
++ as_expr=false
+fi
+
+ rm -f conf$$ conf$$.exe conf$$.file
+ if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+- mkdir conf$$.dir 2>/dev/null
++ mkdir conf$$.dir
+ fi
+-if (echo >conf$$.file) 2>/dev/null; then
+- if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
+- elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+- else
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+
+-
+-# as_fn_mkdir_p
+-# -------------
+-# Create "$as_dir" as a directory, including parents if necessary.
+-as_fn_mkdir_p ()
+-{
+-
+- case $as_dir in #(
+- -*) as_dir=./$as_dir;;
+- esac
+- test -d "$as_dir" || eval $as_mkdir_p || {
+- as_dirs=
+- while :; do
+- case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+- *) as_qdir=$as_dir;;
+- esac
+- as_dirs="'$as_qdir' $as_dirs"
+- as_dir=`$as_dirname -- "$as_dir" ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+- s//\1/
+- q
+- }
+- /^X\(\/\/\)[^/].*/{
+- s//\1/
+- q
+- }
+- /^X\(\/\/\)$/{
+- s//\1/
+- q
+- }
+- /^X\(\/\).*/{
+- s//\1/
+- q
+- }
+- s/.*/./; q'`
+- test -d "$as_dir" && break
+- done
+- test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+-
+-
+-} # as_fn_mkdir_p
+ if mkdir -p . 2>/dev/null; then
+- as_mkdir_p='mkdir -p "$as_dir"'
++ as_mkdir_p=:
+ else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+@@ -11513,12 +17732,12 @@ else
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+- test -d "$1/.";
++ test -d "$1/.";
+ else
+- case $1 in #(
+- -*)set "./$1";;
++ case $1 in
++ -*)set "./$1";;
+ esac;
+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+@@ -11533,19 +17752,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+
+
+ exec 6>&1
+-## ----------------------------------- ##
+-## Main body of $CONFIG_STATUS script. ##
+-## ----------------------------------- ##
+-_ASEOF
+-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# Save the log message, to keep $0 and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.61. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -11558,35 +17771,27 @@ on `(hostname || uname -n) 2>/dev/null |
+
+ _ACEOF
+
+-case $ac_config_files in *"
+-"*) set x $ac_config_files; shift; ac_config_files=$*;;
+-esac
+-
+-
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+ config_files="$ac_config_files"
+ config_commands="$ac_config_commands"
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ac_cs_usage="\
+-\`$as_me' instantiates files and other configuration actions
+-from templates according to the current configuration. Unless the files
+-and actions are specified as TAGs, all are instantiated by default.
++\`$as_me' instantiates files from templates according to the
++current configuration.
+
+-Usage: $0 [OPTION]... [TAG]...
++Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+- -q, --quiet, --silent
+- do not print progress messages
++ -q, --quiet do not print progress messages
+ -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
++ --file=FILE[:TEMPLATE]
++ instantiate the configuration file FILE
+
+ Configuration files:
+ $config_files
+@@ -11594,28 +17799,27 @@ $config_files
+ Configuration commands:
+ $config_commands
+
+-Report bugs to the package provider."
++Report bugs to <bug-autoconf at gnu.org>."
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.64,
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.61,
++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
+-AWK='$AWK'
+-test -n "\$AWK" || AWK=awk
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# The default lists apply if the user does not specify any file.
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value. By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+@@ -11637,27 +17841,25 @@ do
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+- $as_echo "$ac_cs_version"; exit ;;
++ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+- case $ac_optarg in
+- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+- esac
+- as_fn_append CONFIG_FILES " '$ac_optarg'"
++ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ ac_need_defaults=false;;
+ --he | --h | --help | --hel | -h )
+- $as_echo "$ac_cs_usage"; exit ;;
++ echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error "unrecognized option: \`$1'
+-Try \`$0 --help' for more information." ;;
++ -*) { echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
++ { (exit 1); exit 1; }; } ;;
+
+- *) as_fn_append ac_config_targets " $1"
++ *) ac_config_targets="$ac_config_targets $1"
+ ac_need_defaults=false ;;
+
+ esac
+@@ -11672,29 +17874,27 @@ if $ac_cs_silent; then
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+- shift
+- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+- CONFIG_SHELL='$SHELL'
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+- exec "\$@"
++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ exec 5>>config.log
+ {
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+- $as_echo "$ac_log"
++ echo "$ac_log"
+ } >&5
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS
+ #
+@@ -11708,7 +17908,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+
+ # Handling of arguments.
+ for ac_config_target in $ac_config_targets
+@@ -11717,7 +17917,9 @@ do
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "$outlist") CONFIG_FILES="$CONFIG_FILES $outlist" ;;
+
+- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++ { (exit 1); exit 1; }; };;
+ esac
+ done
+
+@@ -11743,7 +17945,7 @@ $debug ||
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ ' 0
+- trap 'as_fn_exit 1' 1 2 13 15
++ trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+ # Create a (secure) tmp directory for tmp files.
+
+@@ -11754,174 +17956,365 @@ $debug ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} ||
++{
++ echo "$me: cannot create a temporary directory in ." >&2
++ { (exit 1); exit 1; }
++}
++
++#
++# Set up the sed scripts for CONFIG_FILES section.
++#
+
+-# Set up the scripts for CONFIG_FILES section.
+-# No need to generate them if there are no CONFIG_FILES.
+-# This happens for instance with `./config.status config.h'.
++# 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
+
+-if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+- ac_cs_awk_getline=:
+- ac_cs_awk_pipe_init=
+- ac_cs_awk_read_file='
+- while ((getline aline < (F[key])) > 0)
+- print(aline)
+- close(F[key])'
+- ac_cs_awk_pipe_fini=
+-else
+- ac_cs_awk_getline=false
+- ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
+- ac_cs_awk_read_file='
+- print "|#_!!_#|"
+- print "cat " F[key] " &&"
+- '$ac_cs_awk_pipe_init
+- # The final `:' finishes the AND list.
+- ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+-fi
+-ac_cr=`echo X | tr X '\015'`
+-# On cygwin, bash can eat \r inside `` if the user requested igncr.
+-# But we know of no other shell where ac_cr would be empty at this
+-# point, so we can use a bashism as a fallback.
+-if test "x$ac_cr" = x; then
+- eval ac_cr=\$\'\\r\'
+-fi
+-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\r'
+-else
+- ac_cs_awk_cr=$ac_cr
+-fi
+-
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+-_ACEOF
+-
+-# Create commands to substitute file output variables.
+-{
+- echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+- echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
+- echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
+- echo "_ACAWK" &&
+- echo "_ACEOF"
+-} >conf$$files.sh &&
+-. ./conf$$files.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-rm -f conf$$files.sh
+-
+-{
+- echo "cat >conf$$subs.awk <<_ACEOF" &&
+- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+- echo "_ACEOF"
+-} >conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++_ACEOF
+
- { echo "$as_me:$LINENO: checking for optreset" >&5
- echo $ECHO_N "checking for optreset... $ECHO_C" >&6; }
- if test "${ac_cv_have_optreset+set}" = set; then
-@@ -16461,6 +16925,9 @@ GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
- LINUX_INCLUDE!$LINUX_INCLUDE$ac_delim
- MAINTAINER_CMT!$MAINTAINER_CMT$ac_delim
++# Create sed commands to just substitute file output variables.
++
++# Remaining file output variables are in a fragment that also has non-file
++# output varibles.
++
++
++
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+- . ./conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++E2FSPROGS_YEAR!$E2FSPROGS_YEAR$ac_delim
++E2FSPROGS_MONTH!$E2FSPROGS_MONTH$ac_delim
++E2FSPROGS_DAY!$E2FSPROGS_DAY$ac_delim
++E2FSPROGS_VERSION!$E2FSPROGS_VERSION$ac_delim
++E2FSPROGS_PKGVER!$E2FSPROGS_PKGVER$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DLOPEN_LIB!$DLOPEN_LIB$ac_delim
++CPP!$CPP$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++LINUX_INCLUDE!$LINUX_INCLUDE$ac_delim
++MAINTAINER_CMT!$MAINTAINER_CMT$ac_delim
++E!$E$ac_delim
++Q!$Q$ac_delim
+LFSCK_CMT!$LFSCK_CMT$ac_delim
+LFSCK_MAN!$LFSCK_MAN$ac_delim
+LUSTRE!$LUSTRE$ac_delim
- HTREE_CMT!$HTREE_CMT$ac_delim
- ELF_CMT!$ELF_CMT$ac_delim
- BSDLIB_CMT!$BSDLIB_CMT$ac_delim
-@@ -16473,7 +16940,7 @@ LDFLAG_DYNAMIC!$LDFLAG_DYNAMIC$ac_delim
- PRIVATE_LIBS_CMT!$PRIVATE_LIBS_CMT$ac_delim
- _ACEOF
++HTREE_CMT!$HTREE_CMT$ac_delim
++ELF_CMT!$ELF_CMT$ac_delim
++BSDLIB_CMT!$BSDLIB_CMT$ac_delim
++PROFILE_CMT!$PROFILE_CMT$ac_delim
++CHECKER_CMT!$CHECKER_CMT$ac_delim
++_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
+- 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
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -16617,6 +17084,7 @@ SIZEOF_LONG!$SIZEOF_LONG$ac_delim
- SIZEOF_LONG_LONG!$SIZEOF_LONG_LONG$ac_delim
- SOCKET_LIB!$SOCKET_LIB$ac_delim
- DLOPEN_LIB!$DLOPEN_LIB$ac_delim
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+ done
+-rm -f conf$$subs.sh
+
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++/^[ ]*@MCONFIG@[ ]*$/{
++r $MCONFIG
++d
++}
++/^[ ]*@MAKEFILE_ELF@[ ]*$/{
++r $MAKEFILE_ELF
++d
++}
++/^[ ]*@MAKEFILE_BSDLIB@[ ]*$/{
++r $MAKEFILE_BSDLIB
++d
++}
++/^[ ]*@MAKEFILE_PROFILE@[ ]*$/{
++r $MAKEFILE_PROFILE
++d
++}
++/^[ ]*@MAKEFILE_CHECKER@[ ]*$/{
++r $MAKEFILE_CHECKER
++d
++}
++/^[ ]*@MAKEFILE_LIBRARY@[ ]*$/{
++r $MAKEFILE_LIBRARY
++d
++}
++/^[ ]*@ASM_TYPES_HEADER@[ ]*$/{
++r $ASM_TYPES_HEADER
++d
++}
++/^[ ]*@PUBLIC_CONFIG_HEADER@[ ]*$/{
++r $PUBLIC_CONFIG_HEADER
++d
++}
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
+ _ACEOF
+-sed -n '
+-h
+-s/^/S["/; s/!.*/"]=/
+-p
+-g
+-s/^[^!]*!//
+-:repl
+-t repl
+-s/'"$ac_delim"'$//
+-t delim
+-:nl
+-h
+-s/\(.\{148\}\).*/\1/
+-t more1
+-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+-p
+-n
+-b repl
+-:more1
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t nl
+-:delim
+-h
+-s/\(.\{148\}\).*/\1/
+-t more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"/
+-p
+-b
+-:more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t delim
+-' <conf$$subs.awk | sed '
+-/^[^""]/{
+- N
+- s/\n//
+-}
+-' >>$CONFIG_STATUS || ac_write_fail=1
+-rm -f conf$$subs.awk
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-_ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+- for (key in S) S_is_set[key] = 1
+- FS = ""
+- \$ac_cs_awk_pipe_init
+-}
+-{
+- line = $ 0
+- nfields = split(line, field, "@")
+- substed = 0
+- len = length(field[1])
+- for (i = 2; i < nfields; i++) {
+- key = field[i]
+- keylen = length(key)
+- if (S_is_set[key]) {
+- value = S[key]
+- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+- len += length(value) + length(field[++i])
+- substed = 1
+- } else
+- len += 1 + keylen
+- }
+- if (nfields == 3 && !substed) {
+- key = field[2]
+- if (F[key] != "" && line ~ /^[ ]*@.*@[ ]*$/) {
+- \$ac_cs_awk_read_file
+- next
+- }
+- }
+- print line
+-}
+-\$ac_cs_awk_pipe_fini
+-_ACAWK
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++LIB_EXT!$LIB_EXT$ac_delim
++STATIC_LIB_EXT!$STATIC_LIB_EXT$ac_delim
++PROFILED_LIB_EXT!$PROFILED_LIB_EXT$ac_delim
++LDFLAG_DYNAMIC!$LDFLAG_DYNAMIC$ac_delim
++PRIVATE_LIBS_CMT!$PRIVATE_LIBS_CMT$ac_delim
++TEST_IO_CMT!$TEST_IO_CMT$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++LIBUUID!$LIBUUID$ac_delim
++DEPLIBUUID!$DEPLIBUUID$ac_delim
++STATIC_LIBUUID!$STATIC_LIBUUID$ac_delim
++DEPSTATIC_LIBUUID!$DEPSTATIC_LIBUUID$ac_delim
++PROFILED_LIBUUID!$PROFILED_LIBUUID$ac_delim
++DEPPROFILED_LIBUUID!$DEPPROFILED_LIBUUID$ac_delim
++UUID_CMT!$UUID_CMT$ac_delim
++LIBBLKID!$LIBBLKID$ac_delim
++DEPLIBBLKID!$DEPLIBBLKID$ac_delim
++STATIC_LIBBLKID!$STATIC_LIBBLKID$ac_delim
++DEPSTATIC_LIBBLKID!$DEPSTATIC_LIBBLKID$ac_delim
++PROFILED_LIBBLKID!$PROFILED_LIBBLKID$ac_delim
++DEPPROFILED_LIBBLKID!$DEPPROFILED_LIBBLKID$ac_delim
++BLKID_CMT!$BLKID_CMT$ac_delim
++DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
++IMAGER_CMT!$IMAGER_CMT$ac_delim
++RESIZER_CMT!$RESIZER_CMT$ac_delim
++FSCK_PROG!$FSCK_PROG$ac_delim
++FSCK_MAN!$FSCK_MAN$ac_delim
++E2INITRD_PROG!$E2INITRD_PROG$ac_delim
++E2INITRD_MAN!$E2INITRD_MAN$ac_delim
++UUIDD_CMT!$UUIDD_CMT$ac_delim
++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
++USE_NLS!$USE_NLS$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
++RANLIB!$RANLIB$ac_delim
++ALLOCA!$ALLOCA$ac_delim
++GLIBC21!$GLIBC21$ac_delim
++HAVE_POSIX_PRINTF!$HAVE_POSIX_PRINTF$ac_delim
++HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim
++HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim
++HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim
++LIBICONV!$LIBICONV$ac_delim
++LTLIBICONV!$LTLIBICONV$ac_delim
++INTLBISON!$INTLBISON$ac_delim
++BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
++USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim
++CATOBJEXT!$CATOBJEXT$ac_delim
++DATADIRNAME!$DATADIRNAME$ac_delim
++INSTOBJEXT!$INSTOBJEXT$ac_delim
++GENCAT!$GENCAT$ac_delim
++INTLOBJS!$INTLOBJS$ac_delim
++INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
++INTLLIBS!$INTLLIBS$ac_delim
++LIBINTL!$LIBINTL$ac_delim
++LTLIBINTL!$LTLIBINTL$ac_delim
++POSUB!$POSUB$ac_delim
++BINARY_TYPE!$BINARY_TYPE$ac_delim
++ifGNUmake!$ifGNUmake$ac_delim
++ifNotGNUmake!$ifNotGNUmake$ac_delim
++LN!$LN$ac_delim
++LN_S!$LN_S$ac_delim
++MV!$MV$ac_delim
++CP!$CP$ac_delim
++RM!$RM$ac_delim
++CHMOD!$CHMOD$ac_delim
++AWK!$AWK$ac_delim
++SED!$SED$ac_delim
++PERL!$PERL$ac_delim
++LDCONFIG!$LDCONFIG$ac_delim
++AR!$AR$ac_delim
++STRIP!$STRIP$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++BUILD_CC!$BUILD_CC$ac_delim
++SIZEOF_SHORT!$SIZEOF_SHORT$ac_delim
++SIZEOF_INT!$SIZEOF_INT$ac_delim
++SIZEOF_LONG!$SIZEOF_LONG$ac_delim
++SIZEOF_LONG_LONG!$SIZEOF_LONG_LONG$ac_delim
++SOCKET_LIB!$SOCKET_LIB$ac_delim
+DB_LIB!$DB_LIB$ac_delim
- SEM_INIT_LIB!$SEM_INIT_LIB$ac_delim
- UNI_DIFF_OPTS!$UNI_DIFF_OPTS$ac_delim
- LINUX_CMT!$LINUX_CMT$ac_delim
-@@ -16638,7 +17106,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
++SEM_INIT_LIB!$SEM_INIT_LIB$ac_delim
++UNI_DIFF_OPTS!$UNI_DIFF_OPTS$ac_delim
++LINUX_CMT!$LINUX_CMT$ac_delim
++CYGWIN_CMT!$CYGWIN_CMT$ac_delim
++UNIX_CMT!$UNIX_CMT$ac_delim
++root_prefix!$root_prefix$ac_delim
++root_bindir!$root_bindir$ac_delim
++root_sbindir!$root_sbindir$ac_delim
++root_libdir!$root_libdir$ac_delim
++root_sysconfdir!$root_sysconfdir$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+-else
+- cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error "could not setup config files machinery" "$LINENO" 5
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++LDFLAG_STATIC!$LDFLAG_STATIC$ac_delim
++SS_DIR!$SS_DIR$ac_delim
++ET_DIR!$ET_DIR$ac_delim
++DO_TEST_SUITE!$DO_TEST_SUITE$ac_delim
++INTL_FLAGS!$INTL_FLAGS$ac_delim
++BUILD_CFLAGS!$BUILD_CFLAGS$ac_delim
++BUILD_LDFLAGS!$BUILD_LDFLAGS$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: e2fsprogs-1.41.5/configure.in
++
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+@@ -11937,20 +18330,20 @@ s/^[^=]*=[ ]*$//
+ }'
+ fi
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ fi # test -n "$CONFIG_FILES"
+
+
+-eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS"
+-shift
+-for ac_tag
++for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
+ do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -11978,34 +18371,26 @@ do
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++ { (exit 1); exit 1; }; };;
+ esac
+- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+- as_fn_append ac_file_inputs " '$ac_f'"
++ ac_file_inputs="$ac_file_inputs $ac_f"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+- configure_input='Generated from '`
+- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+- `' by configure.'
++ configure_input="Generated from "`IFS=:
++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ if test x"$ac_file" != x-; then
+ 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;}
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
+ fi
+- # Neutralize special characters interpreted by sed in replacement strings.
+- case $configure_input in #(
+- *\&* | *\|* | *\\* )
+- ac_sed_conf_input=`$as_echo "$configure_input" |
+- sed 's/[\\\\&|]/\\\\&/g'`;; #(
+- *) ac_sed_conf_input=$configure_input;;
+- esac
+
+ case $ac_tag in
+- *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
+ esac
+@@ -12015,7 +18400,42 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$ac_file" |
++echo X"$ac_file" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ { as_dir="$ac_dir"
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
++ as_dirs=
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$as_dir" : 'X\(//\)[^/]' \| \
++ X"$as_dir" : 'X\(//\)$' \| \
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -12033,15 +18453,20 @@ $as_echo X"$ac_file" |
+ q
+ }
+ s/.*/./; q'`
+- as_dir="$ac_dir"; as_fn_mkdir_p
++ test -d "$as_dir" && break
++ done
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
++ { (exit 1); exit 1; }; }; }
+ ac_builddir=.
+
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -12081,12 +18506,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+ esac
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ # If the template does not know about datarootdir, expand it.
+ # FIXME: This hack should be removed a few years after 2.60.
+ ac_datarootdir_hack=; ac_datarootdir_seen=
+-ac_sed_dataroot='
+-/datarootdir/ {
++
++case `sed -n '/datarootdir/ {
+ p
+ q
+ }
+@@ -12094,37 +18519,36 @@ ac_sed_dataroot='
+ /@docdir@/p
+ /@infodir@/p
+ /@localedir@/p
+-/@mandir@/p'
+-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++/@mandir@/p
++' $ac_file_inputs` in
+ *datarootdir*) ac_datarootdir_seen=yes;;
+ *@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;}
++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+- s&\\\${datarootdir}&$datarootdir&g' ;;
++ s&\\\${datarootdir}&$datarootdir&g' ;;
+ esac
+ _ACEOF
+
+ # Neutralize VPATH when `$srcdir' = `.'.
+ # Shell code in configure.ac might set extrasub.
+ # FIXME: do we really want to maintain this feature?
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-ac_sed_extra="$ac_vpsub
++cat >>$CONFIG_STATUS <<_ACEOF
++ sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s|@configure_input@|$ac_sed_conf_input|;t t
++s&@configure_input@&$configure_input&;t t
+ s&@top_builddir@&$ac_top_builddir_sub&;t t
+-s&@top_build_prefix@&$ac_top_build_prefix&;t t
+ s&@srcdir@&$ac_srcdir&;t t
+ s&@abs_srcdir@&$ac_abs_srcdir&;t t
+ s&@top_srcdir@&$ac_top_srcdir&;t t
+@@ -12134,34 +18558,26 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
+ $ac_datarootdir_hack
+-"
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
+-if $ac_cs_awk_getline; then
+- $AWK -f "$tmp/subs.awk"
+-else
+- $AWK -f "$tmp/subs.awk" | $SHELL
+-fi >$tmp/out \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined." >&5
+-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+- -) cat "$tmp/out" && rm -f "$tmp/out";;
+- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+- esac \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
++ esac
+ ;;
+
+
+- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+-$as_echo "$as_me: executing $ac_file commands" >&6;}
++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
+
+@@ -12281,13 +18697,11 @@ $as_echo "$as_me: executing $ac_file com
+ done # for ac_tag
+
+
+-as_fn_exit 0
++{ (exit 0); exit 0; }
+ _ACEOF
++chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+
+-test $ac_write_fail = 0 ||
+- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+-
+
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -12307,11 +18721,7 @@ 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.
+- $ac_cs_success || as_fn_exit $?
+-fi
+-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+
+ if test -f util/gen-tarball; then chmod +x util/gen-tarball; fi
+Index: e2fsprogs-1.41.10/configure.in
===================================================================
---- e2fsprogs-1.41.5.orig/configure.in
-+++ e2fsprogs-1.41.5/configure.in
-@@ -172,6 +172,39 @@ AC_MSG_RESULT([Disabling maintainer mode
- )
- AC_SUBST(MAINTAINER_CMT)
+--- e2fsprogs-1.41.10.orig/configure.in
++++ e2fsprogs-1.41.10/configure.in
+@@ -176,6 +176,39 @@ Q=@
+ AC_SUBST(E)
+ AC_SUBST(Q)
dnl
+dnl handle --enable-lfsck
+dnl
@@ -610,7 +27573,7 @@ Index: e2fsprogs-1.41.5/configure.in
dnl handle --enable-compression
dnl
AC_ARG_ENABLE([compression],
-@@ -653,6 +686,7 @@ AC_CHECK_HEADERS(net/if.h,,,
+@@ -709,6 +742,7 @@ AC_CHECK_HEADERS(net/if.h,,,
#include <sys/socket.h>
#endif
]])
@@ -618,9 +27581,9 @@ Index: e2fsprogs-1.41.5/configure.in
AC_FUNC_VPRINTF
dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen
dnl is not decleared.
-@@ -771,6 +805,23 @@ AC_CHECK_LIB(dl, dlopen,
- AC_DEFINE(HAVE_DLOPEN)])
- AC_SUBST(DLOPEN_LIB)
+@@ -826,6 +860,26 @@ SOCKET_LIB=''
+ AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket])
+ AC_SUBST(SOCKET_LIB)
dnl
+dnl Check to see if libdb exists for the sake of lfsck
+dnl
@@ -634,6 +27597,9 @@ Index: e2fsprogs-1.41.5/configure.in
+AC_CHECK_LIB(db-4.3, db_env_create,
+[DB_LIB=-ldb-4.3
+AC_DEFINE(HAVE_DB)])
++AC_CHECK_LIB(db-4.5, db_env_create,
++[DB_LIB=-ldb-4.5
++AC_DEFINE(HAVE_DB)])
+AC_CHECK_LIB(db-4.6, db_env_create,
+[DB_LIB=-ldb-4.6
+AC_DEFINE(HAVE_DB)])
@@ -642,11 +27608,11 @@ Index: e2fsprogs-1.41.5/configure.in
dnl See if optreset exists
dnl
AC_MSG_CHECKING(for optreset)
-Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
+Index: e2fsprogs-1.41.10/e2fsck/Makefile.in
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsck/Makefile.in
-+++ e2fsprogs-1.41.5/e2fsck/Makefile.in
-@@ -12,29 +12,39 @@ INSTALL = @INSTALL@
+--- e2fsprogs-1.41.10.orig/e2fsck/Makefile.in
++++ e2fsprogs-1.41.10/e2fsck/Makefile.in
+@@ -12,30 +12,35 @@ INSTALL = @INSTALL@
@MCONFIG@
PROGS= e2fsck
@@ -657,44 +27623,40 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
XTRA_CFLAGS= -DRESOURCE_TRACK -I.
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P)
--DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) $(DEPLIBE2P)
+ at LFSCK_CMT@LFSCK_LIBS=@DB_LIB@
+ at LFSCK_CMT@LUSTRE_INC=-I @LUSTRE@/lustre/include -Wall
+ at LFSCK_CMT@LUSTRE_LIB=-L @LUSTRE@/lustre/utils
-+
-+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P) \
-+ $(LFSCK_LIBS)
-+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) $(DEPLIBE2P) \
-+ $(LFSCK_LIBS)
++LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P) $(LFSCK_LIBS)
+ DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \
+- $(DEPLIBE2P)
++ $(DEPLIBE2P) $(LFSCK_LIBS)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
- $(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P)
+ $(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P) $(LFSCK_LIBS)
- STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \
-- $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P)
-+ $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P) $(LFSCK_LIBS)
+ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) \
+- $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P)
++ $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P) $(LFSCK_LIBS)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
- $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL)
-+ $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
-+ $(LFSCK_LIBS)
- PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
++ $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) $(LFSCK_LIBS)
+ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) \
- $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P)
-+ $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P) \
-+ $(LFSCK_LIBS)
++ $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P) $(LFSCK_LIBS)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
- @echo " CC $<"
-- @$(CC) -c $(ALL_CFLAGS) $< -o $@
-- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-+ @$(CC) -c $(ALL_CFLAGS) $(LUSTRE_INC) $< -o $@
-+ at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) $(LUSTRE_INC) -g -pg -o profiled/$*.o -c $<
+ $(E) " CC $<"
+- $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+- at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
++ $(Q) $(CC) -c $(ALL_CFLAGS) $(LUSTRE_INC) $< -o $@
++ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(LUSTRE_INC) -g -pg -o profiled/$*.o -c $<
#
# Flags for using Checker
-@@ -63,7 +73,10 @@ COMPILE_ET=$(top_builddir)/lib/et/compil
+@@ -64,7 +69,10 @@ COMPILE_ET=$(top_builddir)/lib/et/compil
OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \
pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
dx_dirinfo.o ehandler.o problem.o message.o recovery.o region.o \
@@ -706,7 +27668,7 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
profiled/super.o profiled/pass1.o profiled/pass1b.o \
-@@ -73,7 +86,8 @@ PROFILED_OBJS= profiled/dict.o profiled/
+@@ -74,7 +82,8 @@ PROFILED_OBJS= profiled/dict.o profiled/
profiled/message.o profiled/problem.o \
profiled/recovery.o profiled/region.o profiled/revoke.o \
profiled/ea_refcount.o profiled/rehash.o profiled/profile.o \
@@ -716,7 +27678,7 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
SRCS= $(srcdir)/e2fsck.c \
$(srcdir)/crc32.c \
-@@ -86,6 +100,7 @@ SRCS= $(srcdir)/e2fsck.c \
+@@ -87,6 +96,7 @@ SRCS= $(srcdir)/e2fsck.c \
$(srcdir)/pass3.c \
$(srcdir)/pass4.c \
$(srcdir)/pass5.c \
@@ -724,7 +27686,7 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
$(srcdir)/journal.c \
$(srcdir)/recovery.c \
$(srcdir)/revoke.c \
-@@ -104,7 +119,10 @@ SRCS= $(srcdir)/e2fsck.c \
+@@ -105,7 +115,10 @@ SRCS= $(srcdir)/e2fsck.c \
prof_err.c \
$(MTRACE_SRC)
@@ -736,40 +27698,40 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
@PROFILE_CMT at all:: e2fsck.profiled
-@@ -158,6 +176,10 @@ check:: tst_refcount tst_region tst_crc3
+@@ -160,6 +173,10 @@ check:: tst_refcount tst_region tst_crc3
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_problem
+ at LFSCK_CMT@lfsck: $(LFSCK_OBJS)
+ at LFSCK_CMT@ @echo " LD $@"
-+ at LFSCK_CMT@ $(LD) -pthread $(ALL_LDFLAGS) $(LUSTRE_INC) $(LFSCK_OBJS) -o lfsck $(LUSTRE_LIB) -llustreapi $(STATIC_DEPLIBS) -static
++ at LFSCK_CMT@ $(LD) -pthread $(ALL_LDFLAGS) $(LUSTRE_INC) $(LFSCK_OBJS) -o lfsck $(LUSTRE_LIB) -llustreapi $(DEPLIBS)
+
extend: extend.o
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
-@@ -181,6 +203,9 @@ profiled:
- @PROFILE_CMT@ @echo " MKDIR $@"
- @PROFILE_CMT@ @mkdir profiled
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
+@@ -183,6 +200,9 @@ profiled:
+ @PROFILE_CMT@ $(E) " MKDIR $@"
+ @PROFILE_CMT@ $(Q) mkdir profiled
+lfsck.8: $(DEP_SUBSTITUTE) $(srcdir)/lfsck.8.in
+ $(SUBSTITUTE_UPTIME) $(srcdir)/lfsck.8.in lfsck.8
+
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
-@@ -190,15 +215,19 @@ e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdi
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
+@@ -192,15 +212,19 @@ e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdi
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
installdirs:
-- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
-- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+ @echo " MKINSTALLDIRS $(root_sbindir) $(sbindir) $(man8dir)"
-+ @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) $(DESTDIR)$(sbindir) \
- $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
+- $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
++ $(E) " MKINSTALLDIRS $(root_sbindir) $(sbindir) $(man8dir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+- $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
++ $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(sbindir)
-install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
-+install: $(PROGS) $(USPROGS) $(MANPAGES) $(FMANPAGES) installdirs
- @for i in $(PROGS); do \
++install: $(PROGS) $(USPROGS) $(MANPAGES) $(FMANPAGES) installdirs
+ $(Q) for i in $(PROGS); do \
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
@@ -777,10 +27739,10 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
+ echo " INSTALL $(sbindir)/$$i"; \
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+ done
- @echo " LINK $(root_sbindir)/fsck.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(E) " LINK $(root_sbindir)/fsck.ext2"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext2
-@@ -248,6 +277,9 @@ uninstall:
+@@ -250,6 +274,9 @@ uninstall:
for i in $(PROGS); do \
$(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
done
@@ -790,7 +27752,7 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
$(RM) -f $(DESTDIR)$(root_sbindir)/fsck.ext2 \
$(DESTDIR)$(root_sbindir)/fsck.ext3 \
$(DESTDIR)$(root_sbindir)/fsck.ext4 \
-@@ -264,7 +296,7 @@ uninstall:
+@@ -266,7 +293,7 @@ uninstall:
$(DESTDIR)$(root_sbindir)/fsck.ext4dev
clean:
@@ -799,9 +27761,9 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
e2fsck.shared e2fsck.profiled flushb e2fsck.8 \
tst_problem tst_crc32 tst_region tst_refcount gen_crc32table \
crc32table.h e2fsck.conf.5 prof_err.c prof_err.h \
-@@ -354,6 +386,13 @@ pass5.o: $(srcdir)/pass5.c $(srcdir)/e2f
+@@ -347,6 +374,13 @@ pass5.o: $(srcdir)/pass5.c $(srcdir)/e2f
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
+pass6.o: $(srcdir)/pass6.c $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
@@ -812,10 +27774,10 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
+ $(srcdir)/problem.h $(srcdir)/lfsck.h
journal.o: $(srcdir)/journal.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
-@@ -472,6 +511,9 @@ region.o: $(srcdir)/region.c $(srcdir)/e
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+@@ -449,6 +483,9 @@ region.o: $(srcdir)/region.c $(srcdir)/e
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h
+lfsck.o: $(srcdir)/lfsck.c $(srcdir)/lfsck.h $(srcdir)/lfsck_common.c \
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
@@ -823,11 +27785,11 @@ Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/profile.h prof_err.h
prof_err.o: prof_err.c
-Index: e2fsprogs-1.41.5/e2fsck/e2fsck.8.in
+Index: e2fsprogs-1.41.10/e2fsck/e2fsck.8.in
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsck/e2fsck.8.in
-+++ e2fsprogs-1.41.5/e2fsck/e2fsck.8.in
-@@ -326,6 +326,20 @@ may not be specified at the same time as
+--- e2fsprogs-1.41.10.orig/e2fsck/e2fsck.8.in
++++ e2fsprogs-1.41.10/e2fsck/e2fsck.8.in
+@@ -322,6 +322,20 @@ may not be specified at the same time as
or
.B \-p
options.
@@ -848,10 +27810,10 @@ Index: e2fsprogs-1.41.5/e2fsck/e2fsck.8.in
.SH EXIT CODE
The exit code returned by
.B e2fsck
-Index: e2fsprogs-1.41.5/e2fsck/e2fsck.c
+Index: e2fsprogs-1.41.10/e2fsck/e2fsck.c
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsck/e2fsck.c
-+++ e2fsprogs-1.41.5/e2fsck/e2fsck.c
+--- e2fsprogs-1.41.10.orig/e2fsck/e2fsck.c
++++ e2fsprogs-1.41.10/e2fsck/e2fsck.c
@@ -190,8 +190,11 @@ void e2fsck_free_context(e2fsck_t ctx)
typedef void (*pass_t)(e2fsck_t ctx);
@@ -866,10 +27828,10 @@ Index: e2fsprogs-1.41.5/e2fsck/e2fsck.c
#define E2F_FLAG_RUN_RETURN (E2F_FLAG_SIGNAL_MASK|E2F_FLAG_RESTART)
-Index: e2fsprogs-1.41.5/e2fsck/e2fsck.h
+Index: e2fsprogs-1.41.10/e2fsck/e2fsck.h
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsck/e2fsck.h
-+++ e2fsprogs-1.41.5/e2fsck/e2fsck.h
+--- e2fsprogs-1.41.10.orig/e2fsck/e2fsck.h
++++ e2fsprogs-1.41.10/e2fsck/e2fsck.h
@@ -156,6 +156,7 @@ struct resource_track {
#define E2F_OPT_WRITECHECK 0x0200
#define E2F_OPT_COMPRESS_DIRS 0x0400
@@ -913,10 +27875,10 @@ Index: e2fsprogs-1.41.5/e2fsck/e2fsck.h
/* e2fsck.c */
extern errcode_t e2fsck_allocate_context(e2fsck_t *ret);
-Index: e2fsprogs-1.41.5/e2fsck/pass1.c
+Index: e2fsprogs-1.41.10/e2fsck/pass1.c
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsck/pass1.c
-+++ e2fsprogs-1.41.5/e2fsck/pass1.c
+--- e2fsprogs-1.41.10.orig/e2fsck/pass1.c
++++ e2fsprogs-1.41.10/e2fsck/pass1.c
@@ -48,6 +48,7 @@
#include "e2fsck.h"
@@ -925,7 +27887,7 @@ Index: e2fsprogs-1.41.5/e2fsck/pass1.c
#include "problem.h"
-@@ -338,6 +339,9 @@ static void check_ea_in_inode(e2fsck_t c
+@@ -339,6 +340,9 @@ static void check_ea_in_inode(e2fsck_t c
goto fix;
}
@@ -935,7 +27897,7 @@ Index: e2fsprogs-1.41.5/e2fsck/pass1.c
remain -= entry->e_value_size;
entry = EXT2_EXT_ATTR_NEXT(entry);
-@@ -833,6 +837,12 @@ void e2fsck_pass1(e2fsck_t ctx)
+@@ -873,6 +877,12 @@ void e2fsck_pass1(e2fsck_t ctx)
ext2fs_mark_block_bitmap(ctx->block_found_map,
fs->super->s_mmp_block);
@@ -948,7 +27910,7 @@ Index: e2fsprogs-1.41.5/e2fsck/pass1.c
while (1) {
if (ino % EXT2_MMP_INODE_INTERVAL == 0) {
errcode_t error;
-@@ -1359,6 +1369,9 @@ void e2fsck_pass1(e2fsck_t ctx)
+@@ -1400,6 +1410,9 @@ void e2fsck_pass1(e2fsck_t ctx)
}
e2fsck_pass1_dupblocks(ctx, block_buf);
}
@@ -958,7 +27920,7 @@ Index: e2fsprogs-1.41.5/e2fsck/pass1.c
ext2fs_free_mem(&inodes_to_process);
endit:
e2fsck_use_inode_shortcuts(ctx, 0);
-@@ -1769,6 +1782,14 @@ static int check_ext_attr(e2fsck_t ctx,
+@@ -1805,6 +1818,14 @@ static int check_ext_attr(e2fsck_t ctx,
entry->e_hash = hash;
}
@@ -973,10 +27935,10 @@ Index: e2fsprogs-1.41.5/e2fsck/pass1.c
entry = EXT2_EXT_ATTR_NEXT(entry);
}
if (region_allocate(region, (char *)entry - (char *)header, 4)) {
-Index: e2fsprogs-1.41.5/e2fsck/unix.c
+Index: e2fsprogs-1.41.10/e2fsck/unix.c
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsck/unix.c
-+++ e2fsprogs-1.41.5/e2fsck/unix.c
+--- e2fsprogs-1.41.10.orig/e2fsck/unix.c
++++ e2fsprogs-1.41.10/e2fsck/unix.c
@@ -10,6 +10,7 @@
*/
@@ -1181,7 +28143,7 @@ Index: e2fsprogs-1.41.5/e2fsck/unix.c
if (show_version_only)
return 0;
if (optind != argc - 1)
-@@ -1569,6 +1700,12 @@ no_journal:
+@@ -1665,6 +1796,12 @@ no_journal:
ext2fs_close(fs);
ctx->fs = NULL;
free(ctx->journal_name);
@@ -1194,11 +28156,11 @@ Index: e2fsprogs-1.41.5/e2fsck/unix.c
e2fsck_free_context(ctx);
remove_error_table(&et_ext2_error_table);
-Index: e2fsprogs-1.41.5/misc/mke2fs.c
+Index: e2fsprogs-1.41.10/misc/mke2fs.c
===================================================================
---- e2fsprogs-1.41.5.orig/misc/mke2fs.c
-+++ e2fsprogs-1.41.5/misc/mke2fs.c
-@@ -1300,7 +1300,7 @@ static void PRS(int argc, char *argv[])
+--- e2fsprogs-1.41.10.orig/misc/mke2fs.c
++++ e2fsprogs-1.41.10/misc/mke2fs.c
+@@ -1351,7 +1351,7 @@ static void PRS(int argc, char *argv[])
}
break;
case 'v':
@@ -1207,10 +28169,10 @@ Index: e2fsprogs-1.41.5/misc/mke2fs.c
break;
case 'F':
force++;
-Index: e2fsprogs-1.41.5/util/subst.conf.in
+Index: e2fsprogs-1.41.10/util/subst.conf.in
===================================================================
---- e2fsprogs-1.41.5.orig/util/subst.conf.in
-+++ e2fsprogs-1.41.5/util/subst.conf.in
+--- e2fsprogs-1.41.10.orig/util/subst.conf.in
++++ e2fsprogs-1.41.10/util/subst.conf.in
@@ -5,6 +5,8 @@ SS_DIR @SS_DIR@
E2FSPROGS_MONTH @E2FSPROGS_MONTH@
E2FSPROGS_YEAR @E2FSPROGS_YEAR@
@@ -1220,10 +28182,10 @@ Index: e2fsprogs-1.41.5/util/subst.conf.in
SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
SIZEOF_LONG @SIZEOF_LONG@
SIZEOF_INT @SIZEOF_INT@
-Index: e2fsprogs-1.41.5/e2fsprogs.spec.in
+Index: e2fsprogs-1.41.10/e2fsprogs.spec.in
===================================================================
---- e2fsprogs-1.41.5.orig/e2fsprogs.spec.in
-+++ e2fsprogs-1.41.5/e2fsprogs.spec.in
+--- e2fsprogs-1.41.10.orig/e2fsprogs.spec.in
++++ e2fsprogs-1.41.10/e2fsprogs.spec.in
@@ -10,17 +10,21 @@ Release: 0%{_vendor}
License: GPLv2
Group: System Environment/Base
@@ -1274,10 +28236,10 @@ Index: e2fsprogs-1.41.5/e2fsprogs.spec.in
%{_mandir}/man8/findfs.8*
%{_mandir}/man8/fsck.ext2.8*
%{_mandir}/man8/fsck.ext3.8*
-Index: e2fsprogs-1.41.5/e2fsck/lfsck.8.in
+Index: e2fsprogs-1.41.10/e2fsck/lfsck.8.in
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2fsck/lfsck.8.in
++++ e2fsprogs-1.41.10/e2fsck/lfsck.8.in
@@ -0,0 +1,78 @@
+.\" -*- nroff -*-
+.\" Copyright 2004 by Andreas Dilger. All Rights Reserved.
@@ -1357,14 +28319,14 @@ Index: e2fsprogs-1.41.5/e2fsck/lfsck.8.in
+and maintained by Andreas Dilger <adilger at clusterfs.com>
+.SH SEE ALSO
+.BR e2fsck (8)
-Index: e2fsprogs-1.41.5/e2fsck/lfsck.c
+Index: e2fsprogs-1.41.10/e2fsck/lfsck.c
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2fsck/lfsck.c
-@@ -0,0 +1,1868 @@
++++ e2fsprogs-1.41.10/e2fsck/lfsck.c
+@@ -0,0 +1,1869 @@
+/*
+ * Copyright (c) 2004 Hewlett-Packard Co.
-+ * Copyright 2008 Sun Microsystems, Inc.
++ * Copyright 2009 Sun Microsystems, Inc.
+ */
+/***********************************************************************
+ * This program takes as input files generated by running e2fsck on
@@ -2753,6 +29715,7 @@ Index: e2fsprogs-1.41.5/e2fsck/lfsck.c
+ VERBOSE(2, "%s\n", tmp);
+ rc = system(tmp);
+ if (rc) {
++ rc = -errno;
+ log_write("%s: duplicating object for %u:"LPU64" %s: %s\n",
+ progname, ost_idx, ost_objid, path, strerror(-rc));
+ goto out;
@@ -3230,10 +30193,10 @@ Index: e2fsprogs-1.41.5/e2fsck/lfsck.c
+ return !!fixed;
+ }
+}
-Index: e2fsprogs-1.41.5/e2fsck/lfsck.h
+Index: e2fsprogs-1.41.10/e2fsck/lfsck.h
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2fsck/lfsck.h
++++ e2fsprogs-1.41.10/e2fsck/lfsck.h
@@ -0,0 +1,221 @@
+#undef PACKAGE
+#undef VERSION
@@ -3456,10 +30419,10 @@ Index: e2fsprogs-1.41.5/e2fsck/lfsck.h
+#endif /* ENABLE_LFSCK */
+
+#endif /* LFSCK_H */
-Index: e2fsprogs-1.41.5/e2fsck/lfsck_common.c
+Index: e2fsprogs-1.41.10/e2fsck/lfsck_common.c
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2fsck/lfsck_common.c
++++ e2fsprogs-1.41.10/e2fsck/lfsck_common.c
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2004 Hewlett-Packard Co.
@@ -3784,10 +30747,10 @@ Index: e2fsprogs-1.41.5/e2fsck/lfsck_common.c
+ }
+}
+#endif
-Index: e2fsprogs-1.41.5/e2fsck/pass6.c
+Index: e2fsprogs-1.41.10/e2fsck/pass6.c
===================================================================
--- /dev/null
-+++ e2fsprogs-1.41.5/e2fsck/pass6.c
++++ e2fsprogs-1.41.10/e2fsck/pass6.c
@@ -0,0 +1,1454 @@
+/*
+ * Copyright (c) 2004 Hewlett-Packard Co.
diff --git a/debian/patches/e2fsprogs-lustre_ismounted.patch b/debian/patches/e2fsprogs-lustre_ismounted.patch
index 97e63cf..10e8592 100644
--- a/debian/patches/e2fsprogs-lustre_ismounted.patch
+++ b/debian/patches/e2fsprogs-lustre_ismounted.patch
@@ -106,6 +106,8 @@ Index: e2fsprogs-1.39/lib/ext2fs/ismounted.c
+ goto out;
+ }
+ } while (direntp != NULL);
++
++ closedir(dirp);
+ }
+
+out:
@@ -113,8 +115,6 @@ Index: e2fsprogs-1.39/lib/ext2fs/ismounted.c
+ free(mnt_device);
+ free(real_mnt_device);
+
-+ closedir(dirp);
-+
+ return rc;
+}
+
diff --git a/debian/patches/e2fsprogs-misc.patch b/debian/patches/e2fsprogs-misc.patch
index 4cd8105..a1afbd9 100644
--- a/debian/patches/e2fsprogs-misc.patch
+++ b/debian/patches/e2fsprogs-misc.patch
@@ -1,9 +1,9 @@
For removing some warnings. And some fixes which are already upstream.
-Index: e2fsprogs-1.41.6/lib/ext2fs/dblist.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/dblist.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/dblist.c 2009-06-09 10:19:48.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/dblist.c 2009-06-09 10:19:54.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/dblist.c
++++ e2fsprogs-1.41.9/lib/ext2fs/dblist.c
@@ -169,7 +169,7 @@ errcode_t ext2fs_add_dir_block(ext2_dbli
sizeof(struct ext2_db_entry),
&dblist->list);
@@ -13,11 +13,11 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/dblist.c
return retval;
}
}
-Index: e2fsprogs-1.41.6/misc/badblocks.c
+Index: e2fsprogs-1.41.9/misc/badblocks.c
===================================================================
---- e2fsprogs-1.41.6.orig/misc/badblocks.c 2009-06-09 10:19:48.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/badblocks.c 2009-06-09 10:19:54.000000000 -0400
-@@ -969,7 +969,7 @@ int main (int argc, char ** argv)
+--- e2fsprogs-1.41.9.orig/misc/badblocks.c
++++ e2fsprogs-1.41.9/misc/badblocks.c
+@@ -981,7 +981,7 @@ int main (int argc, char ** argv)
FILE * in = NULL;
int block_size = 1024;
unsigned int blocks_at_once = 64;
@@ -26,7 +26,7 @@ Index: e2fsprogs-1.41.6/misc/badblocks.c
int num_passes = 0;
int passes_clean = 0;
int dev;
-@@ -1109,9 +1109,10 @@ int main (int argc, char ** argv)
+@@ -1116,9 +1116,10 @@ int main (int argc, char ** argv)
usage();
device_name = argv[optind++];
if (optind > argc - 1) {
@@ -38,7 +38,7 @@ Index: e2fsprogs-1.41.6/misc/badblocks.c
if (errcode == EXT2_ET_UNIMPLEMENTED) {
com_err(program_name, 0,
_("Couldn't determine device size; you "
-@@ -1123,6 +1124,7 @@ int main (int argc, char ** argv)
+@@ -1130,6 +1131,7 @@ int main (int argc, char ** argv)
_("while trying to determine device size"));
exit(1);
}
@@ -46,11 +46,20 @@ Index: e2fsprogs-1.41.6/misc/badblocks.c
} else {
errno = 0;
last_block = parse_uint(argv[optind], _("last block"));
-Index: e2fsprogs-1.41.6/misc/tune2fs.c
+Index: e2fsprogs-1.41.9/misc/tune2fs.c
===================================================================
---- e2fsprogs-1.41.6.orig/misc/tune2fs.c 2009-06-09 10:19:48.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/tune2fs.c 2009-06-09 10:19:54.000000000 -0400
-@@ -1570,6 +1570,17 @@ retry_open:
+--- e2fsprogs-1.41.9.orig/misc/tune2fs.c
++++ e2fsprogs-1.41.9/misc/tune2fs.c
+@@ -1044,7 +1044,7 @@ static int move_block(ext2_filsys fs, ex
+ {
+
+ char *buf;
+- dgrp_t group;
++ dgrp_t group = 0;
+ errcode_t retval;
+ int meta_data = 0;
+ blk_t blk, new_blk, goal;
+@@ -1611,6 +1611,17 @@ retry_open:
sb = fs->super;
fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
diff --git a/debian/patches/e2fsprogs-mmp.patch b/debian/patches/e2fsprogs-mmp.patch
index 1f3c5b7..493595e 100644
--- a/debian/patches/e2fsprogs-mmp.patch
+++ b/debian/patches/e2fsprogs-mmp.patch
@@ -13,10 +13,10 @@ information to the sysadmin in case of conflict.
Signed-off-by: Kalpak Shah <kalpak at clusterfs.com>
Signed-off-by: Andreas Dilger <adilger at clusterfs.com>
-Index: e2fsprogs-1.41.6/lib/e2p/feature.c
+Index: e2fsprogs-1.41.9/lib/e2p/feature.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/e2p/feature.c 2009-02-14 08:49:08.000000000 -0500
-+++ e2fsprogs-1.41.6/lib/e2p/feature.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/e2p/feature.c
++++ e2fsprogs-1.41.9/lib/e2p/feature.c
@@ -72,7 +72,9 @@ static struct feature feature_list[] = {
{ E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_64BIT,
"64bit" },
@@ -28,10 +28,10 @@ Index: e2fsprogs-1.41.6/lib/e2p/feature.c
{ 0, 0, 0 },
};
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_fs.h
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2_fs.h
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2_fs.h 2009-06-10 08:01:08.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2_fs.h 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2_fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2_fs.h
@@ -579,7 +579,7 @@ struct ext2_super_block {
__u16 s_want_extra_isize; /* New inodes should reserve # bytes */
__u32 s_flags; /* Miscellaneous flags */
@@ -100,10 +100,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_fs.h
+#define EXT2_MMP_MIN_CHECK_INTERVAL 5
#endif /* _LINUX_EXT2_FS_H */
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2fs.h 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2fs.h
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2fs.h
@@ -172,6 +172,8 @@ typedef struct ext2_file *ext2_file_t;
#define EXT2_FLAG_EXCLUSIVE 0x4000
#define EXT2_FLAG_SOFTSUPP_FEATURES 0x8000
@@ -168,7 +168,7 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
#endif
#define EXT2_LIB_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER|\
EXT4_FEATURE_RO_COMPAT_HUGE_FILE|\
-@@ -1106,6 +1132,16 @@ errcode_t ext2fs_link(ext2_filsys fs, ex
+@@ -1112,6 +1138,16 @@ errcode_t ext2fs_link(ext2_filsys fs, ex
errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, const char *name,
ext2_ino_t ino, int flags);
@@ -185,7 +185,7 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
/* read_bb.c */
extern errcode_t ext2fs_read_bb_inode(ext2_filsys fs,
ext2_badblocks_list *bb_list);
-@@ -1140,6 +1176,7 @@ extern void ext2fs_swap_inode_full(ext2_
+@@ -1146,6 +1182,7 @@ extern void ext2fs_swap_inode_full(ext2_
int bufsize);
extern void ext2fs_swap_inode(ext2_filsys fs,struct ext2_inode *t,
struct ext2_inode *f, int hostorder);
@@ -193,10 +193,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2fs.h
/* valid_blk.c */
extern int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode);
-Index: e2fsprogs-1.41.6/misc/tune2fs.c
+Index: e2fsprogs-1.41.9/misc/tune2fs.c
===================================================================
---- e2fsprogs-1.41.6.orig/misc/tune2fs.c 2009-06-09 10:19:54.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/tune2fs.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/misc/tune2fs.c
++++ e2fsprogs-1.41.9/misc/tune2fs.c
@@ -64,8 +64,9 @@ char *device_name;
char *new_label, *new_last_mounted, *new_UUID;
char *io_options;
@@ -355,7 +355,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
if (FEATURE_OFF(E2P_FEATURE_COMPAT, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
-@@ -374,22 +384,89 @@ static void update_feature_set(ext2_fils
+@@ -374,21 +384,88 @@ static void update_feature_set(ext2_fils
"cleared when the filesystem is\n"
"unmounted or mounted "
"read-only.\n"), stderr);
@@ -379,8 +379,8 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
- remove_journal_device(fs);
+ if (remove_journal_device(fs))
+ return 1;
- }
- }
++ }
++ }
+ if (FEATURE_ON(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_MMP)) {
+ int error;
+
@@ -417,7 +417,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
+ "be disabled if the filesystem is readonly.\n"),
+ stderr);
+ return 1;
-+ }
+ }
+
+ error = ext2fs_read_bitmaps(fs);
+ if (error) {
@@ -445,10 +445,9 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
+mmp_error:
+ sb->s_mmp_block = 0;
+ sb->s_mmp_update_interval = 0;
-+ }
+ }
if (FEATURE_ON(E2P_FEATURE_COMPAT, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
- /*
@@ -457,12 +534,14 @@ static void update_feature_set(ext2_fils
(old_features[E2P_FEATURE_INCOMPAT] != sb->s_feature_incompat) ||
(old_features[E2P_FEATURE_RO_INCOMPAT] != sb->s_feature_ro_compat))
@@ -497,26 +496,25 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
switch (c) {
case 'c':
max_mount_count = strtol(optarg, &tmp, 0);
-@@ -755,6 +834,26 @@ static void parse_tune2fs_options(int ar
+@@ -755,6 +834,25 @@ static void parse_tune2fs_options(int ar
features_cmd = optarg;
open_flag = EXT2_FLAG_RW;
break;
+ case 'p':
-+ mmp_update_interval = strtol (optarg, &tmp, 0);
++ mmp_update_interval = strtol(optarg, &tmp, 0);
+ if (*tmp && mmp_update_interval < 0) {
-+ com_err (program_name, 0, _("invalid "
-+ "mmp update interval"));
++ com_err(program_name, 0,
++ _("invalid mmp update interval"));
+ usage();
+ }
+ if (mmp_update_interval == 0)
+ mmp_update_interval = EXT2_MMP_UPDATE_INTERVAL;
+ if (mmp_update_interval > EXT2_MMP_UPDATE_INTERVAL) {
-+ com_err (program_name, 0,
-+ _("MMP update interval of %s "
-+ "seconds may be dangerous "
-+ "under high load. Consider "
-+ "decreasing it."),
-+ optarg);
++ com_err(program_name, 0,
++ _("MMP update interval of %s seconds "
++ "may be dangerous under high load. "
++ "Consider decreasing it."),
++ optarg);
+ }
+ p_flag = 1;
+ open_flag = EXT2_FLAG_RW;
@@ -572,16 +570,15 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
/*
-@@ -1496,6 +1601,8 @@ int main(int argc, char **argv)
+@@ -1537,6 +1642,7 @@ int main(int argc, char **argv)
ext2_filsys fs;
struct ext2_super_block *sb;
io_manager io_ptr, io_ptr_orig = NULL;
+ int rc = 0;
-+ int rc2;
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
-@@ -1525,15 +1632,24 @@ int main(int argc, char **argv)
+@@ -1566,14 +1673,26 @@ int main(int argc, char **argv)
io_ptr = unix_io_manager;
retry_open:
@@ -598,20 +595,21 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
device_name);
- fprintf(stderr,
- _("Couldn't find valid filesystem superblock.\n"));
-- exit(1);
+ if (retval == EXT2_ET_MMP_FSCK_ON)
+ fprintf(stderr,
+ _("If you are sure e2fsck is not running then "
+ "use 'tune2fs -f -E clear_mmp {device}'\n"));
++ else if (retval == EXT2_ET_MMP_MAGIC_INVALID)
++ fprintf(stderr,
++ _("Magic for mmp is wrong. Try to fix it by "
++ "using 'fsck {device}'\n"));
+ else if (retval != EXT2_ET_MMP_FAILED)
+ fprintf(stderr,
+ _("Couldn't find valid filesystem superblock.\n"));
-+ rc = 1;
-+ goto closefs;
+ exit(1);
}
- if (I_flag && !io_ptr_orig) {
-@@ -1545,12 +1661,14 @@ retry_open:
+@@ -1586,12 +1705,14 @@ retry_open:
if (new_inode_size == EXT2_INODE_SIZE(fs->super)) {
fprintf(stderr, _("The inode size is already %lu\n"),
new_inode_size);
@@ -628,7 +626,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
/*
-@@ -1559,8 +1677,10 @@ retry_open:
+@@ -1600,8 +1721,10 @@ retry_open:
*/
io_ptr_orig = io_ptr;
retval = tune2fs_setup_tdb(device_name, &io_ptr);
@@ -641,7 +639,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
if (io_ptr != io_ptr_orig) {
ext2fs_close(fs);
goto retry_open;
-@@ -1586,7 +1706,7 @@ retry_open:
+@@ -1627,7 +1750,7 @@ retry_open:
printf("%.*s\n", (int) sizeof(sb->s_volume_name),
sb->s_volume_name);
remove_error_table(&et_ext2_error_table);
@@ -650,7 +648,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
retval = ext2fs_check_if_mounted(device_name, &mount_flags);
-@@ -1594,7 +1714,8 @@ retry_open:
+@@ -1635,7 +1758,8 @@ retry_open:
com_err("ext2fs_check_if_mount", retval,
_("while determining whether %s is mounted."),
device_name);
@@ -660,15 +658,15 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
/* Normally we only need to write out the superblock */
fs->flags |= EXT2_FLAG_SUPER_ONLY;
-@@ -1634,12 +1755,19 @@ retry_open:
+@@ -1675,12 +1799,19 @@ retry_open:
"(%u blocks)\n"),
reserved_ratio, sb->s_r_blocks_count);
}
+ if (p_flag) {
+ sb->s_mmp_update_interval = mmp_update_interval;
+ ext2fs_mark_super_dirty(fs);
-+ printf (_("Setting multiple mount protection update interval to "
-+ "%lu seconds\n"), mmp_update_interval);
++ printf(_("Setting multiple mount protection update interval to "
++ "%u seconds\n"), mmp_update_interval);
+ }
if (r_flag) {
if (reserved_blocks >= sb->s_blocks_count/2) {
@@ -681,7 +679,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
sb->s_r_blocks_count = reserved_blocks;
ext2fs_mark_super_dirty(fs);
-@@ -1663,7 +1791,8 @@ retry_open:
+@@ -1704,7 +1835,8 @@ retry_open:
if (s_flag == 0) {
fputs(_("\nClearing the sparse superflag not supported.\n"),
stderr);
@@ -691,7 +689,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
if (T_flag) {
sb->s_lastcheck = last_check_time;
-@@ -1691,14 +1820,30 @@ retry_open:
+@@ -1732,14 +1864,36 @@ retry_open:
sizeof(sb->s_last_mounted));
ext2fs_mark_super_dirty(fs);
}
@@ -717,6 +715,12 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
+ rc = parse_extended_opts(fs, extended_cmd);
+ if (rc)
+ goto closefs;
++ if (clear_mmp && !f_flag) {
++ fputs(_("Error in using clear_mmp. "
++ "It must be used with -f\n"),
++ stderr);
++ goto closefs;
++ }
+ }
+ if (clear_mmp) {
+ rc = ext2fs_mmp_clear(fs);
@@ -730,7 +734,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
if (U_flag) {
int set_csum = 0;
-@@ -1726,7 +1871,8 @@ retry_open:
+@@ -1767,7 +1921,8 @@ retry_open:
uuid_generate(sb->s_uuid);
} else if (uuid_parse(new_UUID, sb->s_uuid)) {
com_err(program_name, 0, _("Invalid UUID format\n"));
@@ -740,7 +744,7 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
if (set_csum) {
for (i = 0; i < fs->group_desc_count; i++)
-@@ -1740,7 +1886,8 @@ retry_open:
+@@ -1781,7 +1936,8 @@ retry_open:
fputs(_("The inode size may only be "
"changed when the filesystem is "
"unmounted.\n"), stderr);
@@ -750,9 +754,9 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
}
if (fs->super->s_feature_incompat &
EXT4_FEATURE_INCOMPAT_FLEX_BG) {
-@@ -1778,5 +1925,12 @@ retry_open:
- printf(_("Setting stripe width to %d\n"), stripe_width);
+@@ -1816,5 +1972,12 @@ retry_open:
}
+ free(device_name);
remove_error_table(&et_ext2_error_table);
+
+closefs:
@@ -763,11 +767,11 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.c
+
return (ext2fs_close(fs) ? 1 : 0);
}
-Index: e2fsprogs-1.41.6/e2fsck/pass1.c
+Index: e2fsprogs-1.41.9/e2fsck/pass1.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/pass1.c 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/pass1.c 2009-06-10 12:08:54.000000000 -0400
-@@ -825,7 +825,20 @@ void e2fsck_pass1(e2fsck_t ctx)
+--- e2fsprogs-1.41.9.orig/e2fsck/pass1.c
++++ e2fsprogs-1.41.9/e2fsck/pass1.c
+@@ -822,7 +822,20 @@ void e2fsck_pass1(e2fsck_t ctx)
(fs->super->s_mtime < fs->super->s_inodes_count))
busted_fs_time = 1;
@@ -788,11 +792,11 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1.c
old_op = ehandler_operation(_("getting next inode from scan"));
pctx.errcode = ext2fs_get_next_inode_full(scan, &ino,
inode, inode_size);
-Index: e2fsprogs-1.41.6/e2fsck/pass1b.c
+Index: e2fsprogs-1.41.9/e2fsck/pass1b.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/pass1b.c 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/pass1b.c 2009-06-10 08:02:29.000000000 -0400
-@@ -283,6 +283,13 @@ static void pass1b(e2fsck_t ctx, char *b
+--- e2fsprogs-1.41.9.orig/e2fsck/pass1b.c
++++ e2fsprogs-1.41.9/e2fsck/pass1b.c
+@@ -286,6 +286,13 @@ static void pass1b(e2fsck_t ctx, char *b
pb.pctx = &pctx;
pctx.str = "pass1b";
while (1) {
@@ -806,36 +810,127 @@ Index: e2fsprogs-1.41.6/e2fsck/pass1b.c
pctx.errcode = ext2fs_get_next_inode(scan, &ino, &inode);
if (pctx.errcode == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE)
continue;
-Index: e2fsprogs-1.41.6/e2fsck/unix.c
+Index: e2fsprogs-1.41.9/e2fsck/unix.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/unix.c 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/unix.c 2009-06-10 12:08:53.000000000 -0400
-@@ -1177,6 +1177,19 @@ restart:
- "to do a read-only\n"
- "check of the device.\n"));
- #endif
-+ else if (retval == EXT2_ET_MMP_BAD_BLOCK) {
-+ if (fix_problem(ctx, PR_0_MMP_INVALID_BLK, &pctx)) {
-+ fs->super->s_mmp_block = 0;
-+ ext2fs_mark_super_dirty(fs);
-+ }
-+ } else if (retval == EXT2_ET_MMP_FAILED) {
-+ dump_mmp_msg(fs->mmp_buf, NULL);
-+ } else if (retval == EXT2_ET_MMP_FSCK_ON) {
-+ dump_mmp_msg(fs->mmp_buf,
-+ _("If you are sure that e2fsck "
-+ "is not running then use "
-+ "'tune2fs -f -E clear_mmp {device}'\n"));
+--- e2fsprogs-1.41.9.orig/e2fsck/unix.c
++++ e2fsprogs-1.41.9/e2fsck/unix.c
+@@ -1020,6 +1020,70 @@ static errcode_t try_open_fs(e2fsck_t ct
+ static const char *my_ver_string = E2FSPROGS_VERSION;
+ static const char *my_ver_date = E2FSPROGS_DATE;
+
++int e2fsck_check_mmp(ext2_filsys fs, e2fsck_t ctx)
++{
++ struct mmp_struct *mmp_s;
++ unsigned int mmp_check_interval;
++ errcode_t retval = 0;
++ struct problem_context pctx;
++ unsigned int wait_time = 0;
++
++ clear_problem_context(&pctx);
++ if (fs->mmp_buf == NULL) {
++ retval = ext2fs_get_mem(fs->blocksize, &fs->mmp_buf);
++ if (retval)
++ goto check_error;
++ }
++
++ retval = ext2fs_mmp_read(fs, fs->super->s_mmp_block, fs->mmp_buf);
++ if (retval)
++ goto check_error;
++
++ mmp_s = fs->mmp_buf;
++
++ mmp_check_interval = fs->super->s_mmp_update_interval;
++ if (mmp_check_interval < EXT2_MMP_MIN_CHECK_INTERVAL)
++ mmp_check_interval = EXT2_MMP_MIN_CHECK_INTERVAL;
++
++ /*
++ * If check_interval in MMP block is larger, use that instead of
++ * check_interval from the superblock.
++ */
++ if (mmp_s->mmp_check_interval > mmp_check_interval)
++ mmp_check_interval = mmp_s->mmp_check_interval;
++
++ wait_time = mmp_check_interval * 2 + 1;
++
++ /* Print warning if e2fck will wait for more than 20 secs. */
++ if (wait_time > EXT2_MMP_MIN_CHECK_INTERVAL * 4) {
++ printf("MMP interval is %u seconds and total wait time is %u "
++ "seconds. Please wait...\n",
++ mmp_check_interval, wait_time * 2);
++ }
++
++ return 0;
++
++check_error:
++
++ if (retval == EXT2_ET_MMP_BAD_BLOCK) {
++ if (fix_problem(ctx, PR_0_MMP_INVALID_BLK, &pctx)) {
++ fs->super->s_mmp_block = 0;
++ ext2fs_mark_super_dirty(fs);
+ }
- else
- fix_problem(ctx, PR_0_SB_CORRUPT, &pctx);
- fatal_error(ctx, 0);
-Index: e2fsprogs-1.41.6/e2fsck/problem.c
++ } else if (retval == EXT2_ET_MMP_FAILED) {
++ dump_mmp_msg(fs->mmp_buf, NULL);
++ } else if (retval == EXT2_ET_MMP_FSCK_ON) {
++ dump_mmp_msg(fs->mmp_buf,
++ _("If you are sure that e2fsck "
++ "is not running on any node then use "
++ "'tune2fs -f -E clear_mmp {device}'\n"));
++ } else if (retval == EXT2_ET_MMP_MAGIC_INVALID) {
++ if (fix_problem(ctx, PR_0_MMP_INVALID_MAGIC, &pctx))
++ ext2fs_mmp_clear(fs);
++ }
++ return 1;
++}
++
+ int main (int argc, char *argv[])
+ {
+ errcode_t retval = 0, orig_retval = 0;
+@@ -1088,6 +1152,8 @@ int main (int argc, char *argv[])
+ _("need terminal for interactive repairs"));
+ }
+ ctx->superblock = ctx->use_superblock;
++
++ flags = EXT2_FLAG_SKIP_MMP;
+ restart:
+ #ifdef CONFIG_TESTIO_DEBUG
+ if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) {
+@@ -1096,7 +1162,7 @@ restart:
+ } else
+ #endif
+ io_ptr = unix_io_manager;
+- flags = EXT2_FLAG_NOFREE_ON_ERROR;
++ flags |= EXT2_FLAG_NOFREE_ON_ERROR;
+ if ((ctx->options & E2F_OPT_READONLY) == 0)
+ flags |= EXT2_FLAG_RW;
+ if ((ctx->mount_flags & EXT2_MF_MOUNTED) == 0)
+@@ -1256,6 +1322,21 @@ restart:
+
+ ehandler_init(fs->io);
+
++ if ((fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_MMP) &&
++ (flags & EXT2_FLAG_SKIP_MMP)) {
++ if (e2fsck_check_mmp(fs, ctx))
++ fatal_error(ctx, 0);
++ }
++
++ /*
++ * Restart in order to reopen fs but this time start mmp.
++ */
++ if (flags & EXT2_FLAG_SKIP_MMP) {
++ ext2fs_close(fs);
++ flags &=~EXT2_FLAG_SKIP_MMP;
++ goto restart;
++ }
++
+ if ((ctx->mount_flags & EXT2_MF_MOUNTED) &&
+ !(sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER))
+ goto skip_journal;
+Index: e2fsprogs-1.41.9/e2fsck/problem.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/problem.c 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/problem.c 2009-06-10 08:02:29.000000000 -0400
-@@ -397,6 +397,11 @@ static struct e2fsck_problem problem_tab
- N_("Disable extra_isize feature since @f has 128 byte inodes. "),
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.c
++++ e2fsprogs-1.41.9/e2fsck/problem.c
+@@ -414,6 +414,16 @@ static struct e2fsck_problem problem_tab
+ N_("Disable extra_isize feature since @f has 128 byte inodes.\n"),
PROMPT_NONE, 0 },
+ /* Superblock has invalid MMP block. */
@@ -843,26 +938,34 @@ Index: e2fsprogs-1.41.6/e2fsck/problem.c
+ N_("@S has invalid MMP block. "),
+ PROMPT_CLEAR, PR_PREEN_OK },
+
++ /* Superblock has invalid MMP magic. */
++ { PR_0_MMP_INVALID_MAGIC,
++ N_("@S has invalid MMP magic. "),
++ PROMPT_FIX, PR_PREEN_OK | PR_NO_OK},
++
/* Pass 1 errors */
-Index: e2fsprogs-1.41.6/e2fsck/problem.h
+Index: e2fsprogs-1.41.9/e2fsck/problem.h
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/problem.h 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/problem.h 2009-06-10 08:02:29.000000000 -0400
-@@ -227,6 +227,8 @@ struct problem_context {
+--- e2fsprogs-1.41.9.orig/e2fsck/problem.h
++++ e2fsprogs-1.41.9/e2fsck/problem.h
+@@ -238,6 +238,11 @@ struct problem_context {
/* Clear EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE flag */
#define PR_0_CLEAR_EXTRA_ISIZE 0x000042
+/* Superblock has invalid MMP block. */
+#define PR_0_MMP_INVALID_BLK 0x000043
++
++/* Superblock has invalid MMP magic. */
++#define PR_0_MMP_INVALID_MAGIC 0x000044
/*
* Pass 1 errors
-Index: e2fsprogs-1.41.6/lib/ext2fs/swapfs.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/swapfs.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/swapfs.c 2009-06-10 07:30:33.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/swapfs.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/swapfs.c
++++ e2fsprogs-1.41.9/lib/ext2fs/swapfs.c
@@ -70,6 +70,8 @@ void ext2fs_swap_super(struct ext2_super
sb->s_min_extra_isize = ext2fs_swab16(sb->s_min_extra_isize);
sb->s_want_extra_isize = ext2fs_swab16(sb->s_want_extra_isize);
@@ -885,10 +988,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/swapfs.c
+}
+
#endif
-Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_err.et.in
+Index: e2fsprogs-1.41.9/lib/ext2fs/ext2_err.et.in
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/ext2_err.et.in 2009-06-10 08:01:08.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/ext2_err.et.in 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/ext2_err.et.in
++++ e2fsprogs-1.41.9/lib/ext2fs/ext2_err.et.in
@@ -443,4 +443,25 @@ ec EXT2_ET_EA_NAME_NOT_FOUND,
ec EXT2_ET_EA_NAME_EXISTS,
"Extended attribute name already exists"
@@ -915,10 +1018,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/ext2_err.et.in
+ "MMP: open with O_DIRECT failed"
+
end
-Index: e2fsprogs-1.41.6/lib/ext2fs/openfs.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/openfs.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/openfs.c 2009-04-23 00:01:56.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/openfs.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/openfs.c
++++ e2fsprogs-1.41.9/lib/ext2fs/openfs.c
@@ -22,6 +22,9 @@
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -937,26 +1040,29 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/openfs.c
*/
errcode_t ext2fs_open2(const char *name, const char *io_options,
int flags, int superblock,
-@@ -353,6 +357,14 @@ errcode_t ext2fs_open2(const char *name,
+@@ -353,6 +357,17 @@ errcode_t ext2fs_open2(const char *name,
fs->flags &= ~EXT2_FLAG_NOFREE_ON_ERROR;
*ret_fs = fs;
+
+ if ((fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_MMP) &&
-+ (flags & EXT2_FLAG_RW) && !(flags & EXT2_FLAG_SKIP_MMP)) {
++ !(flags & EXT2_FLAG_SKIP_MMP)) {
+ retval = ext2fs_mmp_start(fs);
-+ if (retval)
++ if (retval) {
++ fs->flags |= EXT2_FLAG_SKIP_MMP; /* just do cleanup */
++ ext2fs_mmp_stop(fs);
+ goto cleanup;
++ }
+ }
+
return 0;
cleanup:
if (flags & EXT2_FLAG_NOFREE_ON_ERROR)
-Index: e2fsprogs-1.41.6/lib/ext2fs/closefs.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/closefs.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/closefs.c 2009-06-10 08:00:44.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/closefs.c 2009-06-10 08:02:29.000000000 -0400
-@@ -477,6 +477,11 @@ errcode_t ext2fs_close(ext2_filsys fs)
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/closefs.c
++++ e2fsprogs-1.41.9/lib/ext2fs/closefs.c
+@@ -397,6 +397,11 @@ errcode_t ext2fs_close(ext2_filsys fs)
if (retval)
return retval;
}
@@ -968,10 +1074,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/closefs.c
ext2fs_free(fs);
return 0;
}
-Index: e2fsprogs-1.41.6/e2fsck/e2fsck.c
+Index: e2fsprogs-1.41.9/e2fsck/e2fsck.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/e2fsck.c 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/e2fsck.c 2009-06-10 12:08:53.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/e2fsck.c
++++ e2fsprogs-1.41.9/e2fsck/e2fsck.c
@@ -199,6 +199,7 @@ int e2fsck_run(e2fsck_t ctx)
{
int i;
@@ -990,10 +1096,10 @@ Index: e2fsprogs-1.41.6/e2fsck/e2fsck.c
e2fsck_pass(ctx);
if (ctx->progress)
(void) (ctx->progress)(ctx, 0, 0, 0);
-Index: e2fsprogs-1.41.6/e2fsck/e2fsck.h
+Index: e2fsprogs-1.41.9/e2fsck/e2fsck.h
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/e2fsck.h 2009-06-10 08:02:26.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/e2fsck.h 2009-06-10 12:08:53.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/e2fsck.h
++++ e2fsprogs-1.41.9/e2fsck/e2fsck.h
@@ -556,6 +556,8 @@ extern blk_t get_backup_sb(e2fsck_t ctx,
const char *name, io_manager manager);
extern int ext2_file_type(unsigned int mode);
@@ -1003,10 +1109,10 @@ Index: e2fsprogs-1.41.6/e2fsck/e2fsck.h
/* unix.c */
extern void e2fsck_clear_progbar(e2fsck_t ctx);
-Index: e2fsprogs-1.41.6/e2fsck/util.c
+Index: e2fsprogs-1.41.9/e2fsck/util.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/util.c 2009-05-28 10:00:12.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/util.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/util.c
++++ e2fsprogs-1.41.9/e2fsck/util.c
@@ -48,6 +48,7 @@ void fatal_error(e2fsck_t ctx, const cha
if (msg)
fprintf (stderr, "e2fsck: %s\n", msg);
@@ -1040,10 +1146,10 @@ Index: e2fsprogs-1.41.6/e2fsck/util.c
+
+ return retval;
+}
-Index: e2fsprogs-1.41.6/lib/ext2fs/freefs.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/freefs.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/freefs.c 2009-02-27 22:56:41.000000000 -0500
-+++ e2fsprogs-1.41.6/lib/ext2fs/freefs.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/freefs.c
++++ e2fsprogs-1.41.9/lib/ext2fs/freefs.c
@@ -53,6 +53,11 @@ void ext2fs_free(ext2_filsys fs)
if (fs->icache)
ext2fs_free_inode_cache(fs->icache);
@@ -1056,10 +1162,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/freefs.c
fs->magic = 0;
ext2fs_free_mem(&fs);
-Index: e2fsprogs-1.41.6/lib/ext2fs/Makefile.in
+Index: e2fsprogs-1.41.9/lib/ext2fs/Makefile.in
===================================================================
---- e2fsprogs-1.41.6.orig/lib/ext2fs/Makefile.in 2009-05-30 13:34:23.000000000 -0400
-+++ e2fsprogs-1.41.6/lib/ext2fs/Makefile.in 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/Makefile.in
++++ e2fsprogs-1.41.9/lib/ext2fs/Makefile.in
@@ -61,6 +61,7 @@ OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_O
lookup.o \
mkdir.o \
@@ -1076,7 +1182,7 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/Makefile.in
$(srcdir)/namei.c \
$(srcdir)/native.c \
$(srcdir)/newdir.c \
-@@ -622,6 +624,8 @@ mkjournal.o: $(srcdir)/mkjournal.c $(src
+@@ -623,6 +625,8 @@ mkjournal.o: $(srcdir)/mkjournal.c $(src
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
$(srcdir)/bitops.h $(srcdir)/jfs_user.h $(srcdir)/kernel-jbd.h \
$(srcdir)/jfs_compat.h $(srcdir)/kernel-list.h
@@ -1085,11 +1191,11 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/Makefile.in
namei.o: $(srcdir)/namei.c $(srcdir)/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
$(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
-Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+Index: e2fsprogs-1.41.9/lib/ext2fs/mmp.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.6/lib/ext2fs/mmp.c 2009-06-10 08:02:29.000000000 -0400
-@@ -0,0 +1,413 @@
+--- /dev/null
++++ e2fsprogs-1.41.9/lib/ext2fs/mmp.c
+@@ -0,0 +1,420 @@
+/*
+ * Helper functions for multiple mount protection(MMP).
+ *
@@ -1133,12 +1239,14 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+
+#define ptr_align(ptr, size) (void *)(((unsigned long)(ptr) + (size) - 1) & \
+ ~((unsigned long)(size) - 1))
++#ifndef O_DIRECT
++#define O_DIRECT 0
++#endif
+
+errcode_t ext2fs_mmp_read(ext2_filsys fs, blk_t mmp_blk, void *buf)
+{
+ struct mmp_struct *mmp_cmp;
+ errcode_t retval = 0;
-+ int fd;
+
+ if ((mmp_blk <= fs->super->s_first_data_block) ||
+ (mmp_blk >= fs->super->s_blocks_count))
@@ -1353,13 +1461,6 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+ if (mmp_check_interval < EXT2_MMP_MIN_CHECK_INTERVAL)
+ mmp_check_interval = EXT2_MMP_MIN_CHECK_INTERVAL;
+
-+ /*
-+ * If check_interval in MMP block is larger, use that instead of
-+ * check_interval from the superblock.
-+ */
-+ if (mmp_s->mmp_check_interval > mmp_check_interval)
-+ mmp_check_interval = mmp_s->mmp_check_interval;
-+
+ seq = mmp_s->mmp_seq;
+ if (seq == EXT2_MMP_SEQ_CLEAN)
+ goto clean_seq;
@@ -1373,6 +1474,13 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+ goto mmp_error;
+ }
+
++ /*
++ * If check_interval in MMP block is larger, use that instead of
++ * check_interval from the superblock.
++ */
++ if (mmp_s->mmp_check_interval > mmp_check_interval)
++ mmp_check_interval = mmp_s->mmp_check_interval;
++
+ sleep(2 * mmp_check_interval + 1);
+
+ retval = ext2fs_mmp_read(fs, fs->super->s_mmp_block, fs->mmp_buf);
@@ -1385,6 +1493,9 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+ }
+
+clean_seq:
++ if (!(fs->flags & EXT2_FLAG_RW))
++ goto mmp_error;
++
+ mmp_s->mmp_seq = seq = ext2fs_mmp_new_seq();
+#if _BSD_SOURCE || _XOPEN_SOURCE >= 500
+ gethostname(mmp_s->mmp_nodename, sizeof(mmp_s->mmp_nodename));
@@ -1442,8 +1553,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+ /* Check if the MMP block is not changed. */
+ mmp = fs->mmp_buf;
+ mmp_cmp = fs->mmp_cmp;
-+ if (memcmp(mmp, mmp_cmp, sizeof(*mmp_cmp)))
-+ return EXT2_ET_MMP_CHANGE_ABORT;
++ if (memcmp(mmp, mmp_cmp, sizeof(*mmp_cmp))) {
++ retval = EXT2_ET_MMP_CHANGE_ABORT;
++ goto mmp_error;
++ }
+
+check_skipped:
+ mmp_cmp->mmp_seq = EXT2_MMP_SEQ_CLEAN;
@@ -1503,10 +1616,10 @@ Index: e2fsprogs-1.41.6/lib/ext2fs/mmp.c
+mmp_error:
+ return retval;
+}
-Index: e2fsprogs-1.41.6/misc/tune2fs.8.in
+Index: e2fsprogs-1.41.9/misc/tune2fs.8.in
===================================================================
---- e2fsprogs-1.41.6.orig/misc/tune2fs.8.in 2009-05-30 12:17:35.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/tune2fs.8.in 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/misc/tune2fs.8.in
++++ e2fsprogs-1.41.9/misc/tune2fs.8.in
@@ -161,6 +161,11 @@ separated, and may take an argument usin
The following extended options are supported:
.RS 1.2i
@@ -1541,11 +1654,11 @@ Index: e2fsprogs-1.41.6/misc/tune2fs.8.in
.BI \-r " reserved-blocks-count"
Set the number of reserved filesystem blocks.
.TP
-Index: e2fsprogs-1.41.6/misc/mke2fs.c
+Index: e2fsprogs-1.41.9/misc/mke2fs.c
===================================================================
---- e2fsprogs-1.41.6.orig/misc/mke2fs.c 2009-06-10 08:00:44.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/mke2fs.c 2009-06-10 12:08:53.000000000 -0400
-@@ -841,7 +841,8 @@ static __u32 ok_features[3] = {
+--- e2fsprogs-1.41.9.orig/misc/mke2fs.c
++++ e2fsprogs-1.41.9/misc/mke2fs.c
+@@ -842,7 +842,8 @@ static __u32 ok_features[3] = {
EXT3_FEATURE_INCOMPAT_EXTENTS|
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|
EXT2_FEATURE_INCOMPAT_META_BG|
@@ -1555,7 +1668,7 @@ Index: e2fsprogs-1.41.6/misc/mke2fs.c
/* R/O compat */
EXT2_FEATURE_RO_COMPAT_LARGE_FILE|
EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
-@@ -2120,8 +2121,20 @@ int main (int argc, char *argv[])
+@@ -2121,8 +2122,20 @@ int main (int argc, char *argv[])
}
no_journal:
@@ -1577,10 +1690,10 @@ Index: e2fsprogs-1.41.6/misc/mke2fs.c
if (!quiet)
printf(_("Writing superblocks and "
"filesystem accounting information: "));
-Index: e2fsprogs-1.41.6/lib/e2p/ls.c
+Index: e2fsprogs-1.41.9/lib/e2p/ls.c
===================================================================
---- e2fsprogs-1.41.6.orig/lib/e2p/ls.c 2009-03-05 17:05:21.000000000 -0500
-+++ e2fsprogs-1.41.6/lib/e2p/ls.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/lib/e2p/ls.c
++++ e2fsprogs-1.41.9/lib/e2p/ls.c
@@ -328,6 +328,12 @@ void list_super2(struct ext2_super_block
fprintf(f, "type %u\n", sb->s_jnl_backup_type);
}
@@ -1594,10 +1707,10 @@ Index: e2fsprogs-1.41.6/lib/e2p/ls.c
}
void list_super (struct ext2_super_block * s)
-Index: e2fsprogs-1.41.6/debugfs/set_fields.c
+Index: e2fsprogs-1.41.9/debugfs/set_fields.c
===================================================================
---- e2fsprogs-1.41.6.orig/debugfs/set_fields.c 2009-06-10 08:00:44.000000000 -0400
-+++ e2fsprogs-1.41.6/debugfs/set_fields.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/debugfs/set_fields.c
++++ e2fsprogs-1.41.9/debugfs/set_fields.c
@@ -129,7 +129,7 @@ static struct field_set_info super_field
{ "flags", &set_sb.s_flags, 4, parse_uint },
{ "raid_stride", &set_sb.s_raid_stride, 2, parse_uint },
@@ -1607,10 +1720,10 @@ Index: e2fsprogs-1.41.6/debugfs/set_fields.c
{ "mmp_block", &set_sb.s_mmp_block, 8, parse_uint },
{ "raid_stripe_width", &set_sb.s_raid_stripe_width, 4, parse_uint },
{ "log_groups_per_flex", &set_sb.s_log_groups_per_flex, 1, parse_uint },
-Index: e2fsprogs-1.41.6/misc/util.c
+Index: e2fsprogs-1.41.9/misc/util.c
===================================================================
---- e2fsprogs-1.41.6.orig/misc/util.c 2009-04-22 22:19:29.000000000 -0400
-+++ e2fsprogs-1.41.6/misc/util.c 2009-06-10 08:02:29.000000000 -0400
+--- e2fsprogs-1.41.9.orig/misc/util.c
++++ e2fsprogs-1.41.9/misc/util.c
@@ -287,3 +287,11 @@ void print_check_message(ext2_filsys fs)
fs->super->s_max_mnt_count,
(double)fs->super->s_checkinterval / (3600 * 24));
@@ -1623,10 +1736,10 @@ Index: e2fsprogs-1.41.6/misc/util.c
+ printf("MMP failure info: last update time: %llu node: %s device: %s\n",
+ (long long)mmp->mmp_time, mmp->mmp_nodename, mmp->mmp_bdevname);
+}
-Index: e2fsprogs-1.41.6/e2fsck/journal.c
+Index: e2fsprogs-1.41.9/e2fsck/journal.c
===================================================================
---- e2fsprogs-1.41.6.orig/e2fsck/journal.c 2009-05-25 20:13:28.000000000 -0400
-+++ e2fsprogs-1.41.6/e2fsck/journal.c 2009-06-10 12:18:39.000000000 -0400
+--- e2fsprogs-1.41.9.orig/e2fsck/journal.c
++++ e2fsprogs-1.41.9/e2fsck/journal.c
@@ -878,6 +878,8 @@ int e2fsck_run_ext3_journal(e2fsck_t ctx
ctx->fs->io->manager->get_stats(ctx->fs->io, &stats);
if (stats && stats->bytes_written)
@@ -1636,3 +1749,60 @@ Index: e2fsprogs-1.41.6/e2fsck/journal.c
ext2fs_free(ctx->fs);
retval = ext2fs_open(ctx->filesystem_name, EXT2_FLAG_RW,
ctx->superblock, blocksize, io_ptr,
+Index: e2fsprogs-1.41.9/debugfs/debug_cmds.ct
+===================================================================
+--- e2fsprogs-1.41.9.orig/debugfs/debug_cmds.ct
++++ e2fsprogs-1.41.9/debugfs/debug_cmds.ct
+@@ -160,5 +160,8 @@ request do_set_current_time, "Set curren
+ request do_supported_features, "Print features supported by this version of e2fsprogs",
+ supported_features;
+
++request do_dump_mmp, "Dump MMP information",
++ dump_mmp;
++
+ end;
+
+Index: e2fsprogs-1.41.9/debugfs/debugfs.c
+===================================================================
+--- e2fsprogs-1.41.9.orig/debugfs/debugfs.c
++++ e2fsprogs-1.41.9/debugfs/debugfs.c
+@@ -2096,6 +2096,39 @@ void do_supported_features(int argc, cha
+ }
+ }
+
++void do_dump_mmp(int argc, char *argv[])
++{
++ struct mmp_struct *mmp_s;
++ errcode_t retval = 0;
++
++ if (current_fs->mmp_buf == NULL) {
++ retval = ext2fs_get_mem(current_fs->blocksize,
++ ¤t_fs->mmp_buf);
++ if (retval) {
++ com_err(argv[0], 0, "Could not allocate memory.\n");
++ return;
++ }
++ }
++
++ mmp_s = current_fs->mmp_buf;
++
++ retval = ext2fs_mmp_read(current_fs, current_fs->super->s_mmp_block,
++ current_fs->mmp_buf);
++ if (retval) {
++ com_err(argv[0], retval, "Error reading MMP block.\n");
++ return;
++ }
++
++ fprintf(stdout, "MMP Block: %llu\n", current_fs->super->s_mmp_block);
++ fprintf(stdout, "MMP Update Interval: %d\n",
++ current_fs->super->s_mmp_update_interval);
++ fprintf(stdout, "MMP Check Interval: %d\n", mmp_s->mmp_check_interval);
++ fprintf(stdout, "MMP Sequence: %lu\n", mmp_s->mmp_seq);
++ fprintf(stdout, "Last Update Time: %llu\n", mmp_s->mmp_time);
++ fprintf(stdout, "Node: %s\n", mmp_s->mmp_nodename);
++ fprintf(stdout, "Device: %s\n", mmp_s->mmp_bdevname);
++}
++
+ static int source_file(const char *cmd_file, int sci_idx)
+ {
+ FILE *f;
diff --git a/debian/patches/e2fsprogs-tests-f_bad_ea_value.patch b/debian/patches/e2fsprogs-tests-f_bad_ea_value.patch
new file mode 100644
index 0000000..9679674
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_bad_ea_value.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_ea_checks.patch b/debian/patches/e2fsprogs-tests-f_ea_checks.patch
new file mode 100644
index 0000000..de45e61
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_ea_checks.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_expisize_ea_del.patch b/debian/patches/e2fsprogs-tests-f_expisize_ea_del.patch
new file mode 100644
index 0000000..39326fb
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_expisize_ea_del.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_bad_blk.patch b/debian/patches/e2fsprogs-tests-f_extents_bad_blk.patch
new file mode 100644
index 0000000..92341d4
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_bad_blk.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_ee_block.patch b/debian/patches/e2fsprogs-tests-f_extents_ee_block.patch
new file mode 100644
index 0000000..4337247
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_ee_block.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_ee_len.patch b/debian/patches/e2fsprogs-tests-f_extents_ee_len.patch
new file mode 100644
index 0000000..881961f
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_ee_len.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_ee_start.patch b/debian/patches/e2fsprogs-tests-f_extents_ee_start.patch
new file mode 100644
index 0000000..f18eade
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_ee_start.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_eh_depth.patch b/debian/patches/e2fsprogs-tests-f_extents_eh_depth.patch
new file mode 100644
index 0000000..ef3c1e9
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_eh_depth.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_eh_entries.patch b/debian/patches/e2fsprogs-tests-f_extents_eh_entries.patch
new file mode 100644
index 0000000..1e513b0
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_eh_entries.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_eh_magic.patch b/debian/patches/e2fsprogs-tests-f_extents_eh_magic.patch
new file mode 100644
index 0000000..2492244
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_eh_magic.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_eh_max.patch b/debian/patches/e2fsprogs-tests-f_extents_eh_max.patch
new file mode 100644
index 0000000..193c004
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_eh_max.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_ei_block.patch b/debian/patches/e2fsprogs-tests-f_extents_ei_block.patch
new file mode 100644
index 0000000..40fe65b
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_ei_block.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_ei_leaf.patch b/debian/patches/e2fsprogs-tests-f_extents_ei_leaf.patch
new file mode 100644
index 0000000..34bdb4f
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_ei_leaf.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_imbalanced_tree.patch b/debian/patches/e2fsprogs-tests-f_extents_imbalanced_tree.patch
new file mode 100644
index 0000000..b51111a
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_imbalanced_tree.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_inrlevel-incons.patch b/debian/patches/e2fsprogs-tests-f_extents_inrlevel-incons.patch
new file mode 100644
index 0000000..f8eddf7
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_inrlevel-incons.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_orphan_blks.patch b/debian/patches/e2fsprogs-tests-f_extents_orphan_blks.patch
new file mode 100644
index 0000000..5f3c82a
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_orphan_blks.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_overlap.patch b/debian/patches/e2fsprogs-tests-f_extents_overlap.patch
new file mode 100644
index 0000000..db26040
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_overlap.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_res_blk.patch b/debian/patches/e2fsprogs-tests-f_extents_res_blk.patch
new file mode 100644
index 0000000..d551a66
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_res_blk.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_shrd_blk.patch b/debian/patches/e2fsprogs-tests-f_extents_shrd_blk.patch
new file mode 100644
index 0000000..a53be4a
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_shrd_blk.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_split.patch b/debian/patches/e2fsprogs-tests-f_extents_split.patch
new file mode 100644
index 0000000..97ffd29
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_split.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_extents_unsorted.patch b/debian/patches/e2fsprogs-tests-f_extents_unsorted.patch
new file mode 100644
index 0000000..49f5b18
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_extents_unsorted.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_fid_in_dirent.patch b/debian/patches/e2fsprogs-tests-f_fid_in_dirent.patch
new file mode 100644
index 0000000..c542723
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_fid_in_dirent.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_ibadness.patch b/debian/patches/e2fsprogs-tests-f_ibadness.patch
new file mode 100644
index 0000000..6aa1f96
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_ibadness.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_ibadness_bad_extents.patch b/debian/patches/e2fsprogs-tests-f_ibadness_bad_extents.patch
new file mode 100644
index 0000000..dc7362e
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_ibadness_bad_extents.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_jchksum_bblk.patch b/debian/patches/e2fsprogs-tests-f_jchksum_bblk.patch
new file mode 100644
index 0000000..0198050
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_jchksum_bblk.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_jchksum_blast_trans.patch b/debian/patches/e2fsprogs-tests-f_jchksum_blast_trans.patch
new file mode 100644
index 0000000..c0191d3
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_jchksum_blast_trans.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_jchksum_remount.patch b/debian/patches/e2fsprogs-tests-f_jchksum_remount.patch
new file mode 100644
index 0000000..3d0b88e
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_jchksum_remount.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_many_subdirs.patch b/debian/patches/e2fsprogs-tests-f_many_subdirs.patch
new file mode 100644
index 0000000..da1da6b
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_many_subdirs.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_mmp.patch b/debian/patches/e2fsprogs-tests-f_mmp.patch
index 67017ca..9220714 100644
--- a/debian/patches/e2fsprogs-tests-f_mmp.patch
+++ b/debian/patches/e2fsprogs-tests-f_mmp.patch
@@ -1,13 +1,13 @@
-Index: e2fsprogs-1.41.5/tests/f_mmp/name
+Index: e2fsprogs-1.41.9/tests/f_mmp/name
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.5/tests/f_mmp/name 2009-06-12 16:02:41.000000000 +0530
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp/name
@@ -0,0 +1 @@
+enable MMP during mke2fs
-Index: e2fsprogs-1.41.5/tests/f_mmp/script
+Index: e2fsprogs-1.41.9/tests/f_mmp/script
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.5/tests/f_mmp/script 2009-06-12 16:23:27.000000000 +0530
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp/script
@@ -0,0 +1,18 @@
+FSCK_OPT=-yf
+touch $TMPFILE
@@ -27,16 +27,16 @@ Index: e2fsprogs-1.41.5/tests/f_mmp/script
+ echo "e2fsck with MMP enabled failed" > $test_name.failed
+fi
+
-Index: e2fsprogs-1.41.5/tests/f_mmp_off/name
+Index: e2fsprogs-1.41.9/tests/f_mmp_off/name
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.5/tests/f_mmp_off/name 2009-06-12 16:16:58.000000000 +0530
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp_off/name
@@ -0,0 +1 @@
+disable MMP
-Index: e2fsprogs-1.41.5/tests/f_mmp_off/script
+Index: e2fsprogs-1.41.9/tests/f_mmp_off/script
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.5/tests/f_mmp_off/script 2009-06-12 16:23:43.000000000 +0530
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp_off/script
@@ -0,0 +1,24 @@
+FSCK_OPT=-yf
+touch $TMPFILE
@@ -62,16 +62,16 @@ Index: e2fsprogs-1.41.5/tests/f_mmp_off/script
+ echo "e2fsck after MMP disable failed" > $test_name.failed
+fi
+
-Index: e2fsprogs-1.41.5/tests/f_mmp_on/name
+Index: e2fsprogs-1.41.9/tests/f_mmp_on/name
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.5/tests/f_mmp_on/name 2009-06-12 16:09:35.000000000 +0530
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp_on/name
@@ -0,0 +1 @@
+enable MMP using tune2fs
-Index: e2fsprogs-1.41.5/tests/f_mmp_on/script
+Index: e2fsprogs-1.41.9/tests/f_mmp_on/script
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.5/tests/f_mmp_on/script 2009-06-12 16:23:37.000000000 +0530
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp_on/script
@@ -0,0 +1,24 @@
+FSCK_OPT=-yf
+touch $TMPFILE
@@ -97,4 +97,49 @@ Index: e2fsprogs-1.41.5/tests/f_mmp_on/script
+ echo "e2fsck with MMP enabled failed" > $test_name.failed
+fi
+
-
+Index: e2fsprogs-1.41.9/tests/f_mmp_corrupt/name
+===================================================================
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp_corrupt/name
+@@ -0,0 +1 @@
++repair MMP when it is corrupted
+Index: e2fsprogs-1.41.9/tests/f_mmp_corrupt/script
+===================================================================
+--- /dev/null
++++ e2fsprogs-1.41.9/tests/f_mmp_corrupt/script
+@@ -0,0 +1,35 @@
++FSCK_OPT=-yf
++touch $TMPFILE
++
++echo "make the test image ..." > $test_name.log
++$MKE2FS -q -F -o Linux -b 1024 -O mmp $TMPFILE 100 >> $test_name.log 2>&1
++status=$?
++if [ "$status" != 0 ] ; then
++ echo "mke2fs -O mmp failed" > $test_name.failed
++ exit 1
++fi
++
++# create a corrupted image
++mmp_block=`$DEBUGFS -R "dump_mmp" $TMPFILE 2>/dev/null | grep "MMP Block" | awk '{print $NF}'`
++echo "mmp_block is: $mmp_block" >> $test_name.log
++echo "corrupt the mmp ..." >> $test_name.log
++dd conv=notrunc if=/dev/zero of=$TMPFILE bs=1k count=1 seek=$mmp_block >> $test_name.log 2>&1
++
++echo "the first fsck ..." >> $test_name.log
++$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1
++status=$?
++if [ "$status" != 0 ] ; then
++ echo "the second fsck ..." >> $test_name.log
++ $FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1
++ status=$?
++ if [ "$status" = 0 ] ; then
++ echo "ok"
++ touch $test_name.ok
++ else
++ echo "the second fsck with corrupted mmp failed" > $test_name.failed
++ fi
++else
++ echo "the first fsck with corrupted mmp failed" > $test_name.failed
++fi
++
++rm -f $TMPFILE
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_blk-uninit-set_inode-uninit-not-set.patch b/debian/patches/e2fsprogs-tests-f_uninit_blk-uninit-set_inode-uninit-not-set.patch
new file mode 100644
index 0000000..bd57802
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_blk-uninit-set_inode-uninit-not-set.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_blks-used_blk-uninit-not-set.patch b/debian/patches/e2fsprogs-tests-f_uninit_blks-used_blk-uninit-not-set.patch
new file mode 100644
index 0000000..1946374
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_blks-used_blk-uninit-not-set.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_checksum_invalid.patch b/debian/patches/e2fsprogs-tests-f_uninit_checksum_invalid.patch
new file mode 100644
index 0000000..f0c6da9
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_checksum_invalid.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_disable.patch b/debian/patches/e2fsprogs-tests-f_uninit_disable.patch
new file mode 100644
index 0000000..4cab584
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_disable.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_enable.patch b/debian/patches/e2fsprogs-tests-f_uninit_enable.patch
new file mode 100644
index 0000000..0ef0429
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_enable.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_incorrect_free_inodes_count.patch b/debian/patches/e2fsprogs-tests-f_uninit_incorrect_free_inodes_count.patch
new file mode 100644
index 0000000..ff37fe5
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_incorrect_free_inodes_count.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_ino-ref_beyond_bg-itable-unused.patch b/debian/patches/e2fsprogs-tests-f_uninit_ino-ref_beyond_bg-itable-unused.patch
new file mode 100644
index 0000000..ae815b6
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_ino-ref_beyond_bg-itable-unused.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_uninit_restart_fsck.patch b/debian/patches/e2fsprogs-tests-f_uninit_restart_fsck.patch
new file mode 100644
index 0000000..58dd0f9
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_uninit_restart_fsck.patch differ
diff --git a/debian/patches/e2fsprogs-tests-f_unsorted_EAs.patch b/debian/patches/e2fsprogs-tests-f_unsorted_EAs.patch
new file mode 100644
index 0000000..a5a0227
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-f_unsorted_EAs.patch differ
diff --git a/debian/patches/e2fsprogs-tests-s_basic_scan.patch b/debian/patches/e2fsprogs-tests-s_basic_scan.patch
new file mode 100644
index 0000000..b8273aa
Binary files /dev/null and b/debian/patches/e2fsprogs-tests-s_basic_scan.patch differ
diff --git a/debian/patches/e2fsprogs-uninit-fixes.patch b/debian/patches/e2fsprogs-uninit-fixes.patch
index 51c40d2..b24ce25 100644
--- a/debian/patches/e2fsprogs-uninit-fixes.patch
+++ b/debian/patches/e2fsprogs-uninit-fixes.patch
@@ -1,13 +1,8 @@
-Bug fixes for uninit_bg feature:
-- display correct inode number during BG_INO_UNINIT and INOREF_IN_USED errors
-- restart e2fsck only once in case of above errors
-- initialize bitmaps properly considering uninit or not (needed for e2freefrag)
-
-Index: e2fsprogs-1.41.4/debugfs/set_fields.c
+Index: e2fsprogs-1.41.9/debugfs/set_fields.c
===================================================================
---- e2fsprogs-1.41.4.orig/debugfs/set_fields.c 2008-10-07 19:52:39.000000000 +0530
-+++ e2fsprogs-1.41.4/debugfs/set_fields.c 2009-04-12 11:20:53.000000000 +0530
-@@ -566,6 +566,7 @@
+--- e2fsprogs-1.41.9.orig/debugfs/set_fields.c
++++ e2fsprogs-1.41.9/debugfs/set_fields.c
+@@ -570,6 +570,7 @@ void do_set_block_group_descriptor(int a
}
set_gd = current_fs->group_desc[set_bg];
@@ -15,88 +10,11 @@ Index: e2fsprogs-1.41.4/debugfs/set_fields.c
if (ss->func(ss, argv[3]) == 0) {
current_fs->group_desc[set_bg] = set_gd;
-Index: e2fsprogs-1.41.4/lib/ext2fs/rw_bitmaps.c
+Index: e2fsprogs-1.41.9/misc/mke2fs.c
===================================================================
---- e2fsprogs-1.41.4.orig/lib/ext2fs/rw_bitmaps.c 2008-10-07 19:52:39.000000000 +0530
-+++ e2fsprogs-1.41.4/lib/ext2fs/rw_bitmaps.c 2009-04-12 11:20:53.000000000 +0530
-@@ -133,6 +133,36 @@
- return 0;
- }
-
-+static void get_uninit_block_bitmap(ext2_filsys fs, dgrp_t group,
-+ char *block_bitmap)
-+{
-+ blk_t super_blk, old_desc_blk, new_desc_blk;
-+ int block_nbytes = (int) EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
-+ int i;
-+
-+ memset(block_bitmap, 0, block_nbytes);
-+
-+ ext2fs_super_and_bgd_loc2(fs, group, &super_blk,
-+ &old_desc_blk, &new_desc_blk, 0);
-+
-+ if (super_blk)
-+ ext2fs_mark_block_bitmap(fs->block_map, super_blk);
-+ if (old_desc_blk)
-+ for (i = 0; i < fs->desc_blocks +
-+ fs->super->s_reserved_gdt_blocks; i++)
-+ ext2fs_mark_block_bitmap(fs->block_map, old_desc_blk+i);
-+ if (new_desc_blk)
-+ ext2fs_mark_block_bitmap(fs->block_map, new_desc_blk);
-+
-+ ext2fs_mark_block_bitmap(fs->block_map,
-+ fs->group_desc[group].bg_block_bitmap);
-+ ext2fs_mark_block_bitmap(fs->block_map,
-+ fs->group_desc[group].bg_inode_bitmap);
-+ for (i = 0; i < fs->inode_blocks_per_group; i++)
-+ ext2fs_mark_block_bitmap(fs->block_map,
-+ fs->group_desc[group].bg_inode_table + i);
-+}
-+
- static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
- {
- dgrp_t i;
-@@ -247,8 +277,15 @@
- retval = EXT2_ET_BLOCK_BITMAP_READ;
- goto cleanup;
- }
-- } else
-- memset(block_bitmap, 0xff, block_nbytes);
-+ } else {
-+ if (EXT2_HAS_COMPAT_FEATURE(fs->super,
-+ EXT2_FEATURE_COMPAT_LAZY_BG) &&
-+ !EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-+ EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
-+ memset(block_bitmap, 0xff, block_nbytes);
-+ else
-+ get_uninit_block_bitmap(fs, i, block_bitmap);
-+ }
- cnt = block_nbytes << 3;
- retval = ext2fs_set_block_bitmap_range(fs->block_map,
- blk_itr, cnt, block_bitmap);
-@@ -269,8 +306,15 @@
- retval = EXT2_ET_INODE_BITMAP_READ;
- goto cleanup;
- }
-- } else
-- memset(inode_bitmap, 0xff, inode_nbytes);
-+ } else {
-+ if (EXT2_HAS_COMPAT_FEATURE(fs->super,
-+ EXT2_FEATURE_COMPAT_LAZY_BG) &&
-+ !EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-+ EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
-+ memset(inode_bitmap, 0xff, inode_nbytes);
-+ else
-+ memset(inode_bitmap, 0, inode_nbytes);
-+ }
- cnt = inode_nbytes << 3;
- retval = ext2fs_set_inode_bitmap_range(fs->inode_map,
- ino_itr, cnt, inode_bitmap);
-Index: e2fsprogs-1.41.4/misc/mke2fs.c
-===================================================================
---- e2fsprogs-1.41.4.orig/misc/mke2fs.c 2009-01-21 00:26:07.000000000 +0530
-+++ e2fsprogs-1.41.4/misc/mke2fs.c 2009-04-12 11:20:53.000000000 +0530
-@@ -275,6 +275,8 @@
+--- e2fsprogs-1.41.9.orig/misc/mke2fs.c
++++ e2fsprogs-1.41.9/misc/mke2fs.c
+@@ -276,6 +276,8 @@ _("Warning: the backup superblock/group
ext2fs_group_desc_csum_set(fs, group);
fs->super->s_free_blocks_count++;
}
@@ -105,7 +23,7 @@ Index: e2fsprogs-1.41.4/misc/mke2fs.c
}
group_block += fs->super->s_blocks_per_group;
}
-@@ -2096,6 +2098,8 @@
+@@ -2119,6 +2121,8 @@ int main (int argc, char *argv[])
}
no_journal:
@@ -114,219 +32,3 @@ Index: e2fsprogs-1.41.4/misc/mke2fs.c
if (!quiet)
printf(_("Writing superblocks and "
"filesystem accounting information: "));
-Index: e2fsprogs-1.41.4/lib/ext2fs/closefs.c
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/ext2fs/closefs.c 2008-10-07 19:52:39.000000000 +0530
-+++ e2fsprogs-1.41.4/lib/ext2fs/closefs.c 2009-04-12 11:20:53.000000000 +0530
-@@ -126,6 +126,86 @@
- return (numblocks);
- }
-
-+/*
-+ * ext2fs_super_and_bgd_loc2()
-+ * @fs: ext2 fs pointer
-+ * @group given block group
-+ * @ret_super_blk: if !NULL, returns super block location
-+ * @ret_old_desc_blk: if !NULL, returns location of the old block
-+ * group descriptor
-+ * @ret_new_desc_blk: if !NULL, returns location of meta_bg block
-+ * group descriptor
-+ * @ret_used_blks: if !NULL, returns number of blocks used by
-+ * super block and group_descriptors.
-+ *
-+ * Returns errcode_t of 0
-+ *
-+ * ret_used_blks returns the number of blocks used by the superblock and
-+ * group descriptors and unlike ext2fs_uper_and_bgd_loc2() it does not make the
-+ * assumption that inode table and bitmaps will be in the same group.
-+ *
-+ * XXX: Remove this when we upgrade our e2fsprogs patches. Also blk64_t has been
-+ * changed to blk_t here since this version does not have 64-bit support.
-+ */
-+errcode_t ext2fs_super_and_bgd_loc2(ext2_filsys fs,
-+ dgrp_t group,
-+ blk_t *ret_super_blk,
-+ blk_t *ret_old_desc_blk,
-+ blk_t *ret_new_desc_blk,
-+ blk_t *ret_used_blks)
-+{
-+ blk_t group_block, super_blk = 0, old_desc_blk = 0, new_desc_blk = 0;
-+ unsigned int meta_bg, meta_bg_size;
-+ blk_t numblocks = 0;
-+ blk_t old_desc_blocks;
-+ int has_super;
-+
-+ group_block = fs->super->s_first_data_block +
-+ (group * fs->super->s_blocks_per_group);
-+
-+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-+ old_desc_blocks = fs->super->s_first_meta_bg;
-+ else
-+ old_desc_blocks =
-+ fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
-+
-+ has_super = ext2fs_bg_has_super(fs, group);
-+
-+ if (has_super) {
-+ super_blk = group_block;
-+ numblocks++;
-+ }
-+ meta_bg_size = EXT2_DESC_PER_BLOCK(fs->super);
-+ meta_bg = group / meta_bg_size;
-+
-+ if (!(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) ||
-+ (meta_bg < fs->super->s_first_meta_bg)) {
-+ if (has_super) {
-+ old_desc_blk = group_block + 1;
-+ numblocks += old_desc_blocks;
-+ }
-+ } else {
-+ if (((group % meta_bg_size) == 0) ||
-+ ((group % meta_bg_size) == 1) ||
-+ ((group % meta_bg_size) == (meta_bg_size-1))) {
-+ if (has_super)
-+ has_super = 1;
-+ new_desc_blk = group_block + has_super;
-+ numblocks++;
-+ }
-+ }
-+
-+ if (ret_super_blk)
-+ *ret_super_blk = super_blk;
-+ if (ret_old_desc_blk)
-+ *ret_old_desc_blk = old_desc_blk;
-+ if (ret_new_desc_blk)
-+ *ret_new_desc_blk = new_desc_blk;
-+ if (ret_used_blks)
-+ *ret_used_blks = numblocks;
-+
-+ return 0;
-+}
-
- /*
- * This function forces out the primary superblock. We need to only
-Index: e2fsprogs-1.41.4/tests/m_uninit/expect.1
-===================================================================
---- e2fsprogs-1.41.4.orig/tests/m_uninit/expect.1 2008-10-07 19:52:40.000000000 +0530
-+++ e2fsprogs-1.41.4/tests/m_uninit/expect.1 2009-04-12 11:20:53.000000000 +0530
-@@ -71,13 +71,13 @@
- Inode table at 8453-8708 (+260)
- 7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks: 8709-16384
-- Free inodes:
-+ Free inodes: 2049-4096
- Group 2: (Blocks 16385-24576) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 16385 (+0), Inode bitmap at 16386 (+1)
- Inode table at 16387-16642 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 16385-24576
-+ Free inodes: 4097-6144
- Group 3: (Blocks 24577-32768) [INODE_UNINIT, ITABLE_ZEROED]
- Backup superblock at 24577, Group descriptors at 24578-24578
- Reserved GDT blocks at 24579-24834
-@@ -85,13 +85,13 @@
- Inode table at 24837-25092 (+260)
- 7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks: 25093-32768
-- Free inodes:
-+ Free inodes: 6145-8192
- Group 4: (Blocks 32769-40960) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 32769 (+0), Inode bitmap at 32770 (+1)
- Inode table at 32771-33026 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 32769-40960
-+ Free inodes: 8193-10240
- Group 5: (Blocks 40961-49152) [INODE_UNINIT, ITABLE_ZEROED]
- Backup superblock at 40961, Group descriptors at 40962-40962
- Reserved GDT blocks at 40963-41218
-@@ -99,13 +99,13 @@
- Inode table at 41221-41476 (+260)
- 7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks: 41477-49152
-- Free inodes:
-+ Free inodes: 10241-12288
- Group 6: (Blocks 49153-57344) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 49153 (+0), Inode bitmap at 49154 (+1)
- Inode table at 49155-49410 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 49153-57344
-+ Free inodes: 12289-14336
- Group 7: (Blocks 57345-65536) [INODE_UNINIT, ITABLE_ZEROED]
- Backup superblock at 57345, Group descriptors at 57346-57346
- Reserved GDT blocks at 57347-57602
-@@ -113,13 +113,13 @@
- Inode table at 57605-57860 (+260)
- 7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks: 57861-65536
-- Free inodes:
-+ Free inodes: 14337-16384
- Group 8: (Blocks 65537-73728) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 65537 (+0), Inode bitmap at 65538 (+1)
- Inode table at 65539-65794 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 65537-73728
-+ Free inodes: 16385-18432
- Group 9: (Blocks 73729-81920) [INODE_UNINIT, ITABLE_ZEROED]
- Backup superblock at 73729, Group descriptors at 73730-73730
- Reserved GDT blocks at 73731-73986
-@@ -127,40 +127,40 @@
- Inode table at 73989-74244 (+260)
- 7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks: 74245-81920
-- Free inodes:
-+ Free inodes: 18433-20480
- Group 10: (Blocks 81921-90112) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 81921 (+0), Inode bitmap at 81922 (+1)
- Inode table at 81923-82178 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 81921-90112
-+ Free inodes: 20481-22528
- Group 11: (Blocks 90113-98304) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 90113 (+0), Inode bitmap at 90114 (+1)
- Inode table at 90115-90370 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 90113-98304
-+ Free inodes: 22529-24576
- Group 12: (Blocks 98305-106496) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 98305 (+0), Inode bitmap at 98306 (+1)
- Inode table at 98307-98562 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 98305-106496
-+ Free inodes: 24577-26624
- Group 13: (Blocks 106497-114688) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 106497 (+0), Inode bitmap at 106498 (+1)
- Inode table at 106499-106754 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 106497-114688
-+ Free inodes: 26625-28672
- Group 14: (Blocks 114689-122880) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
- Block bitmap at 114689 (+0), Inode bitmap at 114690 (+1)
- Inode table at 114691-114946 (+2)
- 7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
-- Free blocks:
-- Free inodes:
-+ Free blocks: 114689-122880
-+ Free inodes: 28673-30720
- Group 15: (Blocks 122881-131071) [INODE_UNINIT, ITABLE_ZEROED]
- Block bitmap at 122881 (+0), Inode bitmap at 122882 (+1)
- Inode table at 122883-123138 (+2)
- 7933 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks: 123139-131071
-- Free inodes:
-+ Free inodes: 30721-32768
diff --git a/debian/patches/e2fsprogs-version.patch b/debian/patches/e2fsprogs-version.patch
index 42fdfef..a5e766d 100644
--- a/debian/patches/e2fsprogs-version.patch
+++ b/debian/patches/e2fsprogs-version.patch
@@ -1,14 +1,15 @@
Change to Sun version number
-Index: e2fsprogs-1.41.6/version.h
+Index: e2fsprogs-1.41.10/version.h
===================================================================
---- e2fsprogs-1.41.6.orig/version.h 2009-05-30 10:51:35.000000000 -0400
-+++ e2fsprogs-1.41.6/version.h 2009-06-09 10:17:58.000000000 -0400
+--- e2fsprogs-1.41.10.orig/version.h
++++ e2fsprogs-1.41.10/version.h
@@ -7,5 +7,6 @@
* redistributed under the GNU Public License.
*/
--#define E2FSPROGS_VERSION "1.41.6"
-+#define E2FSPROGS_VERSION "1.41.6.sun1"
-+/* don't forget to update patches/ChangeLog */
- #define E2FSPROGS_DATE "30-May-2009"
+-#define E2FSPROGS_VERSION "1.41.10"
+-#define E2FSPROGS_DATE "10-Feb-2009"
++#define E2FSPROGS_VERSION "1.41.10.sun2"
++/* Don't forget to update patches/ChangeLog */
++#define E2FSPROGS_DATE "24-Feb-2010"
diff --git a/debian/patches/series b/debian/patches/series
index 1cad2ca..53eb4ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,34 @@
e2fsprogs-version.patch
+e2fsprogs-e2fsck_D.patch
e2fsprogs-misc.patch
+e2fsprogs-e2fsck_exclusive.patch
e2fsprogs-bad-ininode-ea.patch
e2fsprogs-blkid-zfs.patch
+e2fsprogs-fiemap-lustre.patch
e2fsprogs-count_wrong_valid.patch
e2fsprogs-specdotin.patch
e2fsprogs-extended_ops.patch
+e2fsprogs-tests-f_many_subdirs.patch
e2fsprogs-extents.patch
+e2fsprogs-tests-f_bad_ea_value.patch
+e2fsprogs-tests-f_extents_bad_blk.patch
+e2fsprogs-tests-f_extents_ee_block.patch
+e2fsprogs-tests-f_extents_ee_len.patch
+e2fsprogs-tests-f_extents_ee_start.patch
+e2fsprogs-tests-f_extents_eh_depth.patch
+e2fsprogs-tests-f_extents_eh_entries.patch
+e2fsprogs-tests-f_extents_eh_magic.patch
+e2fsprogs-tests-f_extents_eh_max.patch
+e2fsprogs-tests-f_extents_ei_block.patch
+e2fsprogs-tests-f_extents_ei_leaf.patch
+e2fsprogs-tests-f_extents_imbalanced_tree.patch
+e2fsprogs-tests-f_extents_inrlevel-incons.patch
+e2fsprogs-tests-f_extents_orphan_blks.patch
+e2fsprogs-tests-f_extents_overlap.patch
+e2fsprogs-tests-f_extents_res_blk.patch
+e2fsprogs-tests-f_extents_shrd_blk.patch
+e2fsprogs-tests-f_extents_unsorted.patch
+e2fsprogs-tests-f_extents_split.patch
e2fsprogs-skip-extent-tests.patch
e2fsprogs-config-before-cmdline.patch
e2fsprogs-new-opt-shrdblks.patch
@@ -13,18 +36,33 @@ sles/e2fsprogs-SLES10--m-support.patch
sles/libcom_err-no-static-buffer.patch
sles/libcom_err-no-init_error_table.patch
e2fsprogs-uninit-fixes.patch
+e2fsprogs-tests-f_uninit_enable.patch
+e2fsprogs-tests-f_uninit_disable.patch
+e2fsprogs-tests-f_uninit_blks-used_blk-uninit-not-set.patch
+e2fsprogs-tests-f_uninit_blk-uninit-set_inode-uninit-not-set.patch
+e2fsprogs-tests-f_uninit_checksum_invalid.patch
+e2fsprogs-tests-f_uninit_incorrect_free_inodes_count.patch
+e2fsprogs-tests-f_uninit_ino-ref_beyond_bg-itable-unused.patch
+e2fsprogs-tests-f_uninit_restart_fsck.patch
e2fsprogs-expand-extra-isize.patch
e2fsprogs-tests-f_expisize.patch
+e2fsprogs-tests-f_expisize_ea_del.patch
e2fsprogs-ibadness-counter.patch
+e2fsprogs-tests-f_ibadness.patch
+e2fsprogs-tests-f_ibadness_bad_extents.patch
e2fsprogs-tests-f_random_corruption.patch
e2fsprogs-mmp.patch
e2fsprogs-tests-f_mmp.patch
+e2fsprogs-tests-f_jchksum_bblk.patch
+e2fsprogs-tests-f_jchksum_blast_trans.patch
+e2fsprogs-tests-f_jchksum_remount.patch
e2fsprogs-i_size-corruption.patch
-e2fsprogs-fiemap-lustre.patch
e2fsprogs-disp-extent_header.patch
-e2fsprogs-e2freefrag.patch
e2fsprogs-lustre_ismounted.patch
-e2fsprogs-lfsck.patch
+e2fsprogs-lfsck.patch
+e2fsprogs-lfsck-absolute-path.patch
e2fsprogs-add-io_channel_readahead.patch
-e2fsprogs-e2scan.patch
-static-linking.patch
+e2fsprogs-e2scan.patch
+e2fsprogs-tests-s_basic_scan.patch
+e2fsprogs-fid_in_dirent.patch
+e2fsprogs-tests-f_fid_in_dirent.patch
--
Repository for maintaining lidskfsprogs
More information about the Pkg-lustre-svn-commit
mailing list