[coreboot] get mkelfimage from our svn tree

Jordan Crouse jordan.crouse at amd.com
Wed Aug 6 22:55:46 CEST 2008


On 06/08/08 16:50 -0400, Ward Vandewege wrote:
> See attached. The bulk of it is just the svn remove of the two patches that
> have already been applied to mkelfimage in our svn repo.
> 
> Thanks,
> Ward.
> 
> -- 
> Ward Vandewege <ward at fsf.org>
> Free Software Foundation - Senior Systems Administrator

> 
> The upstream for mkelfiamge at lnxi has become somewhat unreliable. Reconfigure
> buildrom to pull it from our svn tree, where we've had a copy for a while.
> 
> Signed-off-by: Ward Vandewege <ward at gnu.org>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>

> Index: packages/mkelfimage/mkelfImage-2.7-x86_64.patch
> ===================================================================
> --- packages/mkelfimage/mkelfImage-2.7-x86_64.patch	(revision 214)
> +++ packages/mkelfimage/mkelfImage-2.7-x86_64.patch	(working copy)
> @@ -1,563 +0,0 @@
> -[PATCH] mkelfImage: Take elf64 vmlinux and produce elf32
> -
> -change to use e_entry instead of hardcode for vmlinux
> -if e_entry is not equal to paddr of fist phdr, will use paddr instead, and not switch to 64bit in convert
> -otherwise will use e_entry and switch to 64bit in convert
> -
> -also fix the bss_size calculation.
> -
> -Signed-off-By: Yinghai Lu <yinghai.lu at amd.com>
> -
> -diff -uNr mkelfImage-2.7/linux-i386/convert.h mkelfImage-2.7.new/linux-i386/convert.h
> ---- mkelfImage-2.7/linux-i386/convert.h	2006-03-17 06:08:21.000000000 -0800
> -+++ mkelfImage-2.7.new/linux-i386/convert.h	2006-11-08 12:32:15.000000000 -0800
> -@@ -3,6 +3,8 @@
> - #define CONVERTLOC 		0x10000
> - #define REAL_MODE_DATA_LOC	0x20000
> - #define GDTLOC	   		0x21000
> -+#define GDT64LOC		0x22000
> -+#define PGTLOC			0x23000
> - 
> - #define DEFAULT_ROOT_DEV ((0x3<<8)| 0)
> - 
> -@@ -18,10 +20,13 @@
> - struct image_parameters {
> - 	uint32_t convert_magic; /* a signature to verify mkelfImage was built properly */
> - 	uint32_t gdt_size;
> -+	uint32_t gdt64_size;
> -+	uint32_t pgt_size;
> - 	uint32_t bss_size;
> - 	uint16_t ramdisk_flags;
> - 	uint16_t root_dev;
> - 	uint32_t entry;
> -+	uint32_t switch_64;
> - 	uint32_t initrd_start;
> - 	uint32_t initrd_size;
> - 	uint8_t  cmdline[CMDLINE_MAX];
> -diff -uNr mkelfImage-2.7/linux-i386/convert.lds mkelfImage-2.7.new/linux-i386/convert.lds
> ---- mkelfImage-2.7/linux-i386/convert.lds	2003-01-16 13:41:14.000000000 -0800
> -+++ mkelfImage-2.7.new/linux-i386/convert.lds	2006-11-08 12:19:12.000000000 -0800
> -@@ -27,7 +27,7 @@
> - 		*(.bss)
> - 	}
> - 	_end = . ;
> --	bss_size = _end - _bss;
> -+	bss_sizex = _end - _bss;
> - 	
> - 	/DISCARD/ : {
> - 		*(.comment)
> -diff -uNr mkelfImage-2.7/linux-i386/head.S mkelfImage-2.7.new/linux-i386/head.S
> ---- mkelfImage-2.7/linux-i386/head.S	2003-01-24 14:48:03.000000000 -0800
> -+++ mkelfImage-2.7.new/linux-i386/head.S	2006-11-08 12:19:32.000000000 -0800
> -@@ -59,7 +59,7 @@
> - 	movl	$GDTLOC, %edi
> - 	movl	$(gdt_end - gdt), %ecx
> - 	rep	movsb
> --	
> -+
> - 	# Linux makes stupid assumptions about the segments
> - 	# that are already setup, so setup a new gdt & ldt
> - 	# and then reload the segment registers.
> -@@ -95,22 +95,113 @@
> - 	# Flag to indicate we are the bootstrap processor
> - 	xorl	%ebx, %ebx
> - 
> -+	movl    switch_64, %eax
> -+	cmp	$1, %eax
> -+	jz	switch_to_64
> -+
> - 	# Clear the unspecified registers for good measure
> - 	xorl	%eax, %eax
> - 	xorl	%ecx, %ecx
> - 	xorl	%edx, %edx
> - 	xorl	%edi, %edi
> --	xorl	%esp, %esp
> - 	xorl	%ebp, %ebp
> -+
> -+	# do not clear esp, we still need to use lret later
> -+
> -+        pushl $PROT_CODE_SEG
> -+        movl entry, %eax
> -+        pushl %eax
> -+
> -+	lret
> -+
> -+switch_to_64:
> -+
> -+	/* We need to switch to 64bit before use startup_64 entry go to kernel */
> -+ /*
> -+  * Prepare for entering 64 bit mode
> -+  */
> -+        # Move the gdt64 where Linux will not smash it during decompression
> -+	movl	%esi, %eax # save the real mode pointer
> -+	movl    $gdt64, %esi
> -+	movl    $GDT64LOC, %edi
> -+	movl    $(gdt64_end - gdt64), %ecx
> -+	rep     movsb
> -+	movl	%eax, %esi
> -+
> -+	/* Load new GDT with the 64bit segments using 32bit descriptor */
> -+	lgdt	gdt64
> -+
> -+	/* Enable PAE mode */
> -+	xorl    %eax, %eax
> -+	btsl    $5, %eax
> -+	movl    %eax, %cr4
> -+
> -+ /*
> -+  * Build early 4G boot pagetable
> -+  */
> -+       /* Initialize Page tables to 0*/
> -+       movl    $PGTLOC, %edi
> -+       xorl    %eax, %eax
> -+       movl    $((4096*6)/4), %ecx
> -+       rep     stosl
> -+
> -+       /* Build Level 4 */
> -+       movl    $(PGTLOC + 0), %edi
> -+       leal    0x1007 (%edi), %eax
> -+       movl    %eax, 0(%edi)
> -+
> -+       /* Build Level 3 */
> -+       movl    $(PGTLOC + 0x1000), %edi
> -+       leal    0x1007(%edi), %eax
> -+       movl    $4, %ecx
> -+1:     movl    %eax, 0x00(%edi)
> -+       addl    $0x00001000, %eax
> -+       addl    $8, %edi
> -+       decl    %ecx
> -+       jnz     1b
> -+
> -+       /* Build Level 2 */
> -+       movl    $(PGTLOC + 0x2000), %edi
> -+       movl    $0x00000183, %eax
> -+       movl    $2048, %ecx
> -+1:     movl    %eax, 0(%edi)
> -+       addl    $0x00200000, %eax
> -+       addl    $8, %edi
> -+       decl    %ecx
> -+       jnz     1b
> -+
> -+       /* Enable the boot page tables */
> -+       movl    $PGTLOC, %eax
> -+       movl    %eax, %cr3
> -+
> -+       /* Enable Long mode in EFER (Extended Feature Enable Register) */
> -+       movl    $0xc0000080, %ecx
> -+       rdmsr
> -+       btsl    $8, %eax
> -+       wrmsr
> -+
> -+	/* Preparing for 64bit jmp */
> -+        pushl $PROT_CODE_SEG
> -+        movl entry, %eax
> -+        pushl %eax
> -+
> -+       /* Enter paged protected Mode, activating Long Mode */
> -+        xorl    %eax, %eax
> -+        btsl    $31, %eax
> -+        btsl    $0, %eax
> -+        movl    %eax, %cr0
> -+
> -+        /*
> -+         * At this point we're in long mode but in 32bit compatibility mode
> -+         * with EFER.LME = 1, CS.L = 0, CS.D = 1 (and in turn
> -+         * EFER.LMA = 1). Now we want to jump in 64bit mode, to do that we use
> -+         * the new gdt/idt that has __KERNEL_CS with CS.L = 1.
> -+         */
> - 
> --
> --	# Jump to the linux kernel
> --	ljmp	$ PROT_CODE_SEG , $ 0x100000
> -+	lret
> - 
> - 
> - 	/* Routines to query the BIOS... */
> --
> --
> - /**************************************************************************
> - E820_MEMSIZE - Get a listing of memory regions
> - **************************************************************************/
> -@@ -409,6 +500,7 @@
> - 	.word	0x9200				# data read/write
> - 	.word	0x00CF				# granularity = 4096, 386
> - 						#  (+5th nibble of limit)
> -+
> - /*
> -  * The layout of the per-CPU GDT under Linux:
> -  *
> -@@ -446,7 +538,14 @@
> -  */
> - gdt_end:
> - 
> --
> -+gdt64:
> -+	.word	gdt64_end - gdt64
> -+	.long	GDT64LOC
> -+	.word	0
> -+	.quad	0x0000000000000000	/* NULL descriptor */
> -+	.quad	0x00af9a000000ffff	/* __KERNEL_CS */
> -+	.quad	0x00cf92000000ffff	/* __KERNEL_DS */
> -+gdt64_end:
> - 	
> - 	.section ".trailer", "a"
> - 	/* Constants set at build time, these are at the very end of my image */
> -@@ -458,14 +557,20 @@
> - 	.long	CONVERT_MAGIC
> - gdt_size:
> - 	.long	gdt_end - gdt
> -+gdt64_size:
> -+	.long	gdt64_end - gdt64
> -+pgt_size:
> -+	.long   4096*6
> - bss_size:
> --	.long	bss_size
> -+	.long	bss_sizex
> - ramdisk_flags:
> - 	.word	0
> - root_dev:
> - 	.word	DEFAULT_ROOT_DEV
> - entry:
> - 	.long	0
> -+switch_64:
> -+	.long	0
> - initrd_start:
> - 	.long	0
> - initrd_size:
> -diff -uNr mkelfImage-2.7/linux-i386/mkelf-linux-i386.c mkelfImage-2.7.new/linux-i386/mkelf-linux-i386.c
> ---- mkelfImage-2.7/linux-i386/mkelf-linux-i386.c	2006-03-17 06:08:22.000000000 -0800
> -+++ mkelfImage-2.7.new/linux-i386/mkelf-linux-i386.c	2006-11-08 09:54:58.000000000 -0800
> -@@ -19,13 +19,16 @@
> - static void (*parse_kernel_type)(struct kernel_info *info, char *kernel_buf, size_t kernel_size);
> - static void parse_bzImage_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size);
> - static void parse_elf32_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size);
> -+static void parse_elf64_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size);
> -+
> -+char *vmlinux_x86_64_probe(char *kernel_buf, off_t kernel_size);
> - 
> - char *vmlinux_i386_probe(char *kernel_buf, off_t kernel_size)
> - {
> - 	Elf32_Ehdr *ehdr;
> - 	Elf32_Phdr *phdr;
> - 	int i;
> --	int hdr1, hdr2;
> -+	int phdrs;
> - 	ehdr = (Elf32_Ehdr *)kernel_buf;
> - 	if (
> - 		(ehdr->e_ident[EI_MAG0] != ELFMAG0) ||
> -@@ -35,7 +38,8 @@
> - 		return "No ELF signature found on kernel\n";
> - 	}
> - 	if (ehdr->e_ident[EI_CLASS] != ELFCLASS32) {
> --		return "Not a 32bit ELF kernel\n";
> -+		return vmlinux_x86_64_probe(kernel_buf, kernel_size);
> -+//		return "Not a 32bit ELF kernel\n";
> - 	}
> - 	if (ehdr->e_ident[EI_DATA]  != ELFDATA2LSB) {
> - 		return "Not a little endian ELF kernel\n";
> -@@ -54,27 +58,64 @@
> - 		return "Kernel uses bad program header size.\n";
> - 	}
> - 	phdr = (Elf32_Phdr *)(kernel_buf + le32_to_cpu(ehdr->e_phoff));
> --	hdr1 = hdr2 = -1;
> --	for(i = 0; i < le32_to_cpu(ehdr->e_phnum); i++) {
> -+	phdrs = 0;
> -+	for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) {
> - 		if (le32_to_cpu(phdr[i].p_type) != PT_LOAD)
> - 			continue;
> --		if (((hdr1 != -1) && 
> --			((le32_to_cpu(phdr[hdr1].p_paddr) & 0xfffffff) != 0x100000)) ||
> --			(hdr2 != -1)) {
> --			return "Too many PT_LOAD segments to be a linux kernel\n";
> --		}
> --		if (hdr1 == -1) {
> --			hdr1 = i;
> --		} else {
> --			hdr2 = i;
> --		}
> -+		phdrs++;
> - 	}
> --	if (hdr1 == -1) {
> -+	if (phdrs == 0) {
> - 		return "No PT_LOAD segments!\n";
> - 	}
> - 	parse_kernel_type = parse_elf32_kernel;
> - 	return 0;
> - }
> -+char *vmlinux_x86_64_probe(char *kernel_buf, off_t kernel_size)
> -+{
> -+        Elf64_Ehdr *ehdr;
> -+        Elf64_Phdr *phdr;
> -+        int i;
> -+	int phdrs = 0;
> -+        ehdr = (Elf64_Ehdr *)kernel_buf;
> -+        if (
> -+                (ehdr->e_ident[EI_MAG0] != ELFMAG0) ||
> -+                (ehdr->e_ident[EI_MAG1] != ELFMAG1) ||
> -+                (ehdr->e_ident[EI_MAG2] != ELFMAG2) ||
> -+                (ehdr->e_ident[EI_MAG3] != ELFMAG3)) {
> -+                return "No ELF signature found on kernel\n";
> -+        }
> -+        if (ehdr->e_ident[EI_CLASS] != ELFCLASS64) {
> -+                return "Not a 64bit ELF kernel\n";
> -+        }
> -+        if (ehdr->e_ident[EI_DATA]  != ELFDATA2LSB) {
> -+                return "Not a little endian ELF kernel\n";
> -+        }
> -+        if (le16_to_cpu(ehdr->e_type) != ET_EXEC) {
> -+                return "Not an executable kernel\n";
> -+        }
> -+        if (le16_to_cpu(ehdr->e_machine) != EM_X86_64) {
> -+                return "Not an x86_64 kernel\n";
> -+        }
> -+        if (    (ehdr->e_ident[EI_VERSION] != EV_CURRENT) ||
> -+                (le32_to_cpu(ehdr->e_version) != EV_CURRENT)) {
> -+                return "Kernel not using ELF version 1.\n";
> -+        }
> -+        if (le16_to_cpu(ehdr->e_phentsize) != sizeof(*phdr)) {
> -+                return "Kernel uses bad program header size.\n";
> -+        }
> -+        phdr = (Elf64_Phdr *)(kernel_buf + le64_to_cpu(ehdr->e_phoff));
> -+	phdrs = 0;
> -+        for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) {
> -+                if (le32_to_cpu(phdr[i].p_type) != PT_LOAD)
> -+                        continue;
> -+		phdrs++;
> -+        }
> -+        if (phdrs == 0) {
> -+                return "No PT_LOAD segments!\n";
> -+        }
> -+        parse_kernel_type = parse_elf64_kernel;
> -+        return 0;
> -+}
> - 
> - char *bzImage_i386_probe(char *kernel_buf, off_t kernel_size)
> - {
> -@@ -118,17 +159,14 @@
> - 
> - struct kernel_info
> - {
> --	void *kernel;
> --	size_t filesz;
> --	size_t memsz;
> --	size_t paddr;
> --	size_t vaddr;
> --	void *kernel2;
> --	size_t filesz2;
> --	size_t memsz2;
> --	size_t paddr2;
> --	size_t vaddr2;
> -+	int phdrs;
> -+	void *kernel[4];
> -+	size_t filesz[4];
> -+	size_t memsz[4];
> -+	size_t paddr[4];
> -+	size_t vaddr[4];
> - 	size_t entry;
> -+	size_t switch_64;
> - 	char *version;
> - };
> - 
> -@@ -137,43 +175,68 @@
> - 	Elf32_Ehdr *ehdr;
> - 	Elf32_Phdr *phdr;
> - 	int i;
> --	int hdr1, hdr2;
> -+	int phdrs;
> - 	ehdr = (Elf32_Ehdr *)kernel_buf;
> - 	phdr = (Elf32_Phdr *)(kernel_buf + ehdr->e_phoff);
> --	hdr1 = hdr2 = -1;
> -+	phdrs = 0;
> - 	for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) {
> - 		if (le32_to_cpu(phdr[i].p_type) != PT_LOAD)
> - 			continue;
> --		if (hdr2 != -1) {
> --			die("Too many PT_LOAD segments to be a linux kernel\n");
> --		}
> --		if (hdr1 == -1) {
> --			hdr1 = i;
> --		} else {
> --			hdr2 = i;
> --		}
> --	}
> --	if (hdr1 == -1) {
> --		die("No PT_LOAD segments!\n");
> -+		info->kernel[phdrs]  = kernel_buf + le32_to_cpu(phdr[i].p_offset);
> -+		info->filesz[phdrs]  = le32_to_cpu(phdr[i].p_filesz);
> -+		info->memsz[phdrs]   = le32_to_cpu(phdr[i].p_memsz);
> -+		info->paddr[phdrs]   = le32_to_cpu(phdr[i].p_paddr) & 0xfffffff;
> -+		info->vaddr[phdrs]   = le32_to_cpu(phdr[i].p_vaddr);
> -+		phdrs++;
> - 	}
> --	info->kernel  = kernel_buf + le32_to_cpu(phdr[hdr1].p_offset);
> --	info->filesz  = le32_to_cpu(phdr[hdr1].p_filesz);
> --	info->memsz   = le32_to_cpu(phdr[hdr1].p_memsz);
> --	info->paddr   = le32_to_cpu(phdr[hdr1].p_paddr) & 0xfffffff;
> --	info->vaddr   = le32_to_cpu(phdr[hdr1].p_vaddr);
> --
> --	if (hdr2 != -1) {
> --		info->kernel2 = kernel_buf + le32_to_cpu(phdr[hdr2].p_offset);
> --		info->filesz2 = le32_to_cpu(phdr[hdr2].p_filesz);
> --		info->memsz2  = le32_to_cpu(phdr[hdr2].p_memsz);
> --		info->paddr2  = le32_to_cpu(phdr[hdr2].p_paddr) & 0xfffffff;
> --		info->vaddr2  = le32_to_cpu(phdr[hdr2].p_vaddr);
> -+
> -+	if(!phdrs)
> -+		die("We need at least one phdr\n");
> -+
> -+	info->phdrs = phdrs;
> -+        info->entry   = le32_to_cpu(ehdr->e_entry);
> -+	info->switch_64   = 0; //not convert from elf64
> -+	info->version = "unknown";
> -+}
> -+
> -+static void parse_elf64_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size)
> -+{
> -+        Elf64_Ehdr *ehdr;
> -+        Elf64_Phdr *phdr;
> -+        int i;
> -+	int phdrs;
> -+        ehdr = (Elf64_Ehdr *)kernel_buf;
> -+        phdr = (Elf64_Phdr *)(kernel_buf + le64_to_cpu(ehdr->e_phoff));
> -+
> -+	phdrs = 0;
> -+	for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) {
> -+		if (le32_to_cpu(phdr[i].p_type) != PT_LOAD)
> -+			continue;
> -+		info->kernel[phdrs]  = kernel_buf + le64_to_cpu(phdr[i].p_offset);
> -+		info->filesz[phdrs]  = le64_to_cpu(phdr[i].p_filesz);
> -+		info->memsz[phdrs]   = le64_to_cpu(phdr[i].p_memsz);
> -+		info->paddr[phdrs]   = le64_to_cpu(phdr[i].p_paddr) & 0xffffff;
> -+		info->vaddr[phdrs]   = le64_to_cpu(phdr[i].p_vaddr);
> -+		phdrs++;
> - 	}
> -+
> -+	if(!phdrs)
> -+		die("We need at least one phdr\n");
> - 	
> --	info->entry   = 0x100000;
> --	info->version = "unknown";
> -+	info->phdrs = phdrs;
> -+        info->entry   = le64_to_cpu(ehdr->e_entry);
> -+#if  0
> -+	if (info->entry != info->paddr[0]) {
> -+		info->entry = info->paddr[0]; // we still have startup_32 there
> -+		info->switch_64   = 0; //not convert from elf64
> -+	} else
> -+#endif
> -+		info->switch_64   = 1; //convert from elf64
> -+
> -+        info->version = "unknown";
> - }
> - 
> -+
> - static void parse_bzImage_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size)
> - {
> - 	struct x86_linux_header *hdr;
> -@@ -186,12 +249,14 @@
> - 	}
> - 	offset = 512 + (512 *setup_sects);
> - 
> --	info->kernel  = kernel_buf + offset;
> --	info->filesz  = kernel_size - offset;
> --	info->memsz   = 0x700000;
> --	info->paddr   = 0x100000;
> --	info->vaddr   = 0x100000;
> --	info->entry   = info->paddr;
> -+	info->kernel[0]  = kernel_buf + offset;
> -+	info->filesz[0]  = kernel_size - offset;
> -+	info->memsz[0]   = 0x700000;
> -+	info->paddr[0]   = 0x100000;
> -+	info->vaddr[0]   = 0x100000;
> -+	info->phdrs = 1;
> -+	info->entry   = info->paddr[0];
> -+	info->switch_64   = 0; //not convert from elf64, even later bzImage become elf64, it still includes startup_32
> - 	info->version = kernel_buf + 512 + le16_to_cpu(hdr->kver_addr);
> - }
> - 
> -@@ -237,6 +302,7 @@
> - 	struct kernel_info kinfo;
> - 	struct image_parameters *params;
> - 	int index;
> -+	int i;
> - 
> - 	int opt;
> - 	static const struct option options[] = {
> -@@ -310,7 +376,7 @@
> - 	
> - 	/* Add a program header for the note section */
> - 	index = 4;
> --	index += kinfo.kernel2 ? 1:0;
> -+	index += (kinfo.phdrs - 1);
> - 	index += ramdisk_size ? 1:0;
> - 	phdr = add_program_headers(ehdr, index);
> - 
> -@@ -328,23 +394,24 @@
> - 	phdr[2].p_paddr  = REAL_MODE_DATA_LOC;
> - 	phdr[2].p_vaddr  = REAL_MODE_DATA_LOC;
> - 	phdr[2].p_filesz = 0;
> --	phdr[2].p_memsz  = (GDTLOC - REAL_MODE_DATA_LOC) + params->gdt_size;
> -+	if(!kinfo.switch_64)
> -+		phdr[2].p_memsz = (GDTLOC - REAL_MODE_DATA_LOC) + params->gdt_size;
> -+	else
> -+		phdr[2].p_memsz = (PGTLOC - REAL_MODE_DATA_LOC) + params->pgt_size;
> - 	phdr[2].p_data   = 0;
> - 
> --	phdr[3].p_paddr  = kinfo.paddr;
> --	phdr[3].p_vaddr  = kinfo.vaddr;
> --	phdr[3].p_filesz = kinfo.filesz;
> --	phdr[3].p_memsz  = kinfo.memsz;
> --	phdr[3].p_data   = kinfo.kernel;
> -+	if( (phdr[1].p_paddr + phdr[1].p_memsz) > phdr[2].p_paddr) {
> -+		die("Internal error: need to increase REAL_MODE_DATA_LOC !\n");
> -+	}
> - 
> --	index = 4;
> -+	index = 3;
> - 	/* Put the second kernel frament if present */
> --	if (kinfo.kernel2) {
> --		phdr[index].p_paddr  = kinfo.paddr2;
> --		phdr[index].p_vaddr  = kinfo.vaddr2;
> --		phdr[index].p_filesz = kinfo.filesz2;
> --		phdr[index].p_memsz  = kinfo.memsz2;
> --		phdr[index].p_data   = kinfo.kernel2;
> -+	for(i=0;i<kinfo.phdrs;i++) {
> -+		phdr[index].p_paddr  = kinfo.paddr[i];
> -+		phdr[index].p_vaddr  = kinfo.vaddr[i];
> -+		phdr[index].p_filesz = kinfo.filesz[i];
> -+		phdr[index].p_memsz  = kinfo.memsz[i];
> -+		phdr[index].p_data   = kinfo.kernel[i];
> - 		index++;
> - 	}
> - 	
> -@@ -352,6 +419,10 @@
> - 	 */
> - 	params->initrd_start = params->initrd_size = 0;
> - 	if (ramdisk_size) {
> -+		if( (phdr[index-1].p_paddr + phdr[index-1].p_memsz) > ramdisk_base) {
> -+			die("need to increase increase ramdisk_base !\n");
> -+		}
> -+
> - 		phdr[index].p_paddr  = ramdisk_base;
> - 		phdr[index].p_vaddr  = ramdisk_base;
> - 		phdr[index].p_filesz = ramdisk_size;
> -@@ -364,6 +435,7 @@
> - 	
> - 	/* Set the start location */
> - 	params->entry = kinfo.entry;
> -+	params->switch_64 = kinfo.switch_64;
> - 	ehdr->e_entry = phdr[1].p_paddr;
> - 
> - 	/* Setup the elf notes */
> -diff -uNr mkelfImage-2.7/linux-ia64/mkelf-linux-ia64.c mkelfImage-2.7.new/linux-ia64/mkelf-linux-ia64.c
> ---- mkelfImage-2.7/linux-ia64/mkelf-linux-ia64.c	2006-03-17 10:09:16.000000000 -0800
> -+++ mkelfImage-2.7.new/linux-ia64/mkelf-linux-ia64.c	2006-11-07 18:14:27.000000000 -0800
> -@@ -81,7 +81,7 @@
> - 	phdr = (Elf64_Phdr *)(kernel_buf + le64_to_cpu(ehdr->e_phoff));
> - 	phdrs = 0;
> - 	for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) {
> --		if (le16_to_cpu(phdr[i].p_type) != PT_LOAD)
> -+		if (le32_to_cpu(phdr[i].p_type) != PT_LOAD)
> - 			continue;
> - 		phdrs++;
> - 	}
> Index: packages/mkelfimage/mkelfimage.mk
> ===================================================================
> --- packages/mkelfimage/mkelfimage.mk	(revision 214)
> +++ packages/mkelfimage/mkelfimage.mk	(working copy)
> @@ -1,16 +1,19 @@
> -MKELFIMAGE_URL=ftp://ftp.lnxi.com/pub/mkelfImage/
> -MKELFIMAGE_SOURCE=mkelfImage-2.7.tar.gz
>  MKELFIMAGE_DIR=$(BUILD_DIR)/mkelfimage
> -MKELFIMAGE_SRC_DIR=$(MKELFIMAGE_DIR)/mkelfImage-2.7
> +MKELFIMAGE_SRC_DIR=$(MKELFIMAGE_DIR)/svn
>  MKELFIMAGE_STAMP_DIR=$(MKELFIMAGE_DIR)/stamps
>  MKELFIMAGE_LOG_DIR=$(MKELFIMAGE_DIR)/logs
> -MKELFIMAGE_PATCHES=$(PACKAGE_DIR)/mkelfimage/mkelfImage-2.7-x86_64.patch
> -MKELFIMAGE_PATCHES+=$(PACKAGE_DIR)/mkelfimage/mkelfimage-autoconf.patch
> +MKELFIMAGE_PATCHES=
>  
> +MKELFIMAGE_TAG=3473
> +MKELFIMAGE_TARBALL=mkelfimage-svn-$(MKELFIMAGE_TAG).tar.gz
> +MKELFIMAGE_URL=svn://coreboot.org/repos/trunk/util/mkelfImage
> +
>  ifeq ($(CONFIG_VERBOSE),y)
> +MKELFIMAGE_FETCH_LOG=/dev/stdout
>  MKELFIMAGE_BUILD_LOG=/dev/stdout
>  MKELFIMAGE_CONFIG_LOG=/dev/stdout
>  else
> +MKELFIMAGE_FETCH_LOG=$(MKELFIMAGE_LOG_DIR)/fetch.log
>  MKELFIMAGE_BUILD_LOG=$(MKELFIMAGE_LOG_DIR)/build.log
>  MKELFIMAGE_CONFIG_LOG=$(MKELFIMAGE_LOG_DIR)/config.log
>  endif
> @@ -18,13 +21,15 @@
>  $(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR):
>  	@ mkdir -p $@
>  
> -$(SOURCE_DIR)/$(MKELFIMAGE_SOURCE):
> +$(SOURCE_DIR)/$(MKELFIMAGE_TARBALL): | $(MKELFIMAGE_LOG_DIR)
> +	@ echo "Fetching the mkelfimage rev $(MKELFIMAGE_TAG) code..."
>  	@ mkdir -p $(SOURCE_DIR)
> -	@ wget $(WGET_Q) -P $(SOURCE_DIR) $(MKELFIMAGE_URL)/$(MKELFIMAGE_SOURCE)
> +	@ $(BIN_DIR)/fetchsvn.sh $(MKELFIMAGE_URL) $(SOURCE_DIR)/mkelfimage \
> +	$(MKELFIMAGE_TAG) $@ > $(MKELFIMAGE_FETCH_LOG) 2>&1
>  
> -$(MKELFIMAGE_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(MKELFIMAGE_SOURCE) | $(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR) 
> +$(MKELFIMAGE_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(MKELFIMAGE_TARBALL) | $(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR) 
>  	@ echo "Unpacking mkelfimage..."
> -	@ tar -C $(MKELFIMAGE_DIR) -zxf $(SOURCE_DIR)/$(MKELFIMAGE_SOURCE)
> +	@ tar -C $(MKELFIMAGE_DIR) -zxf $(SOURCE_DIR)/$(MKELFIMAGE_TARBALL)
>  	@ touch $@	
>  
>  $(MKELFIMAGE_STAMP_DIR)/.patched: $(MKELFIMAGE_STAMP_DIR)/.unpacked
> @@ -61,7 +66,7 @@
>  
>  mkelfimage-bom:
>  	echo "Package: mkelfimage"
> -	echo "Source: $(MKELFIMAGE_URL)/$(MKELFIMAGE_SOURCE)"
> +	echo "Source: $(MKELFIMAGE_URL) rev $(MKELFIMAGE_TAG)"
>  	echo ""
>  
>  mkelfimage-extract: $(MKELFIMAGE_STAMP_DIR)/.patched
> Index: packages/mkelfimage/mkelfimage-autoconf.patch
> ===================================================================
> --- packages/mkelfimage/mkelfimage-autoconf.patch	(revision 214)
> +++ packages/mkelfimage/mkelfimage-autoconf.patch	(working copy)
> @@ -1,6640 +0,0 @@
> -Index: mkelfImage-2.7/configure.ac
> -===================================================================
> ---- mkelfImage-2.7.orig/configure.ac	2006-03-27 16:44:59.000000000 -0700
> -+++ mkelfImage-2.7/configure.ac	2007-12-07 12:14:15.000000000 -0700
> -@@ -173,15 +173,15 @@
> - dnl ---Output variables...
> - 
> - HOST_CC=$CC
> --HOST_CFLAGS='-O2 -Wall $(HOST_CPPFLAGS)'
> -+HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)"
> - 
> - dnl TODO: figure out how to set these appropriately for compilers other than gcc
> --I386_CFLAGS='-Os -ffreestanding -Wall -W -Wno-format $(I386_CPPFLAGS)'
> -+I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)"
> - I386_ASFLAGS=''
> - I386_LDFLAGS='-static --warn-multiple-gp --warn-common'
> - 
> - dnl TODO: figure out how to set these appropriately for compilers other than gcc
> --IA64_CFLAGS='-Os -ffreestanding -Wall -W -Wno-format -fpic -mconstant-gp -mauto-pic -fno-unwind-tables $(IA64_CPPFLAGS)'
> -+IA64_CFLAGS="$IA64_CFLAGS -Os -ffreestanding -Wall -W -Wno-format -fpic -mconstant-gp -mauto-pic -fno-unwind-tables \$(IA64_CPPFLAGS)"
> - IA64_ASFLAGS='-mconstant-gp -mauto-pic'
> - IA64_LDFLAGS='-static --warn-multiple-gp --warn-common'
> - 
> -Index: mkelfImage-2.7/configure
> -===================================================================
> ---- mkelfImage-2.7.orig/configure	2007-12-07 12:14:18.000000000 -0700
> -+++ mkelfImage-2.7/configure	2007-12-07 12:14:21.000000000 -0700
> -@@ -1,25 +1,54 @@
> - #! /bin/sh
> - # Guess values for system-dependent variables and create Makefiles.
> --# Generated by GNU Autoconf 2.59.
> -+# Generated by GNU Autoconf 2.61.
> - #
> --# Copyright (C) 2003 Free Software Foundation, Inc.
> -+# 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.
> - ## --------------------- ##
> - ## M4sh Initialization.  ##
> - ## --------------------- ##
> - 
> --# Be Bourne compatible
> -+# Be more Bourne compatible
> -+DUALCASE=1; export DUALCASE # for MKS sh
> - 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+"$@"}'='"$@"'
> --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
> --  set -o posix
> -+  setopt NO_GLOB_SUBST
> -+else
> -+  case `(set -o) 2>/dev/null` in
> -+  *posix*) set -o posix ;;
> -+esac
> -+
> -+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
> -+  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
> --DUALCASE=1; export DUALCASE # for MKS sh
> - 
> - # Support unset when possible.
> - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
> -@@ -29,8 +58,43 @@
> - fi
> - 
> - 
> -+# IFS
> -+# We need space, tab and new line, in precisely that order.  Quoting is
> -+# 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
> -+  *[\\/]* ) 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
> -+IFS=$as_save_IFS
> -+
> -+     ;;
> -+esac
> -+# We did not find ourselves, most probably we were run as `sh COMMAND'
> -+# in which case we are not to be found in the path.
> -+if test "x$as_myself" = x; then
> -+  as_myself=$0
> -+fi
> -+if test ! -f "$as_myself"; then
> -+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
> -+  { (exit 1); exit 1; }
> -+fi
> -+
> - # Work around bugs in pre-3.0 UWIN ksh.
> --$as_unset ENV MAIL MAILPATH
> -+for as_var in ENV MAIL MAILPATH
> -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
> -+done
> - PS1='$ '
> - PS2='> '
> - PS4='+ '
> -@@ -44,18 +108,19 @@
> -   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
> -+    ($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; then
> -+if expr a : '\(a\)' >/dev/null 2>&1 &&
> -+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
> -   as_expr=expr
> - else
> -   as_expr=false
> - fi
> - 
> --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
> -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
> -   as_basename=basename
> - else
> -   as_basename=false
> -@@ -63,157 +128,388 @@
> - 
> - 
> - # Name of the executable.
> --as_me=`$as_basename "$0" ||
> -+as_me=`$as_basename -- "$0" ||
> - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
> - 	 X"$0" : 'X\(//\)$' \| \
> --	 X"$0" : 'X\(/\)$' \| \
> --	 .     : '\(.\)' 2>/dev/null ||
> -+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
> - echo X/"$0" |
> --    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
> --  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
> --  	  /^X\/\(\/\).*/{ s//\1/; q; }
> --  	  s/.*/./; q'`
> -+    sed '/^.*\/\([^/][^/]*\)\/*$/{
> -+	    s//\1/
> -+	    q
> -+	  }
> -+	  /^X\/\(\/\/\)$/{
> -+	    s//\1/
> -+	    q
> -+	  }
> -+	  /^X\/\(\/\).*/{
> -+	    s//\1/
> -+	    q
> -+	  }
> -+	  s/.*/./; q'`
> - 
> -+# CDPATH.
> -+$as_unset CDPATH
> - 
> --# PATH needs CR, and LINENO needs CR and PATH.
> --# 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
> --  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
> -+if test "x$CONFIG_SHELL" = x; then
> -+  if (eval ":") 2>/dev/null; then
> -+  as_have_required=yes
> -+else
> -+  as_have_required=no
> -+fi
> -+
> -+  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
> -+}
> -+
> -+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
> - 
> --  as_lineno_1=$LINENO
> --  as_lineno_2=$LINENO
> --  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
> --  test "x$as_lineno_1" != "x$as_lineno_2" &&
> --  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
> --  # Find who we are.  Look in the path if we contain no path at all
> --  # relative or not.
> --  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
> -+if as_func_ret_success; then
> -+  :
> -+else
> -+  exitcode=1
> -+  echo as_func_ret_success failed.
> -+fi
> - 
> --       ;;
> --  esac
> --  # We did not find ourselves, most probably we were run as `sh COMMAND'
> --  # in which case we are not to be found in the path.
> --  if test "x$as_myself" = x; then
> --    as_myself=$0
> --  fi
> --  if test ! -f "$as_myself"; then
> --    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
> --   { (exit 1); exit 1; }; }
> --  fi
> --  case $CONFIG_SHELL in
> --  '')
> -+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; }
> -+") 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=.
> --  for as_base in sh bash ksh sh5; do
> --	 case $as_dir in
> -+  case $as_dir in
> - 	 /*)
> --	   if ("$as_dir/$as_base" -c '
> -+	   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
> -+
> -+
> -+      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
> -+
> -+fi
> -+
> -+
> -+:
> -+_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
> --  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
> -   test "x$as_lineno_1" != "x$as_lineno_2" &&
> --  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
> --	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
> --	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
> --	     CONFIG_SHELL=$as_dir/$as_base
> --	     export CONFIG_SHELL
> --	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
> --	   fi;;
> --	 esac
> --       done
> --done
> --;;
> --  esac
> -+  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 before each line; the second 'sed' does the real
> --  # work.  The second script uses 'N' to pair each line-number line
> --  # with the numbered line, and appends trailing '-' during
> --  # substitution so that $LINENO is not a special case at line end.
> -+  # 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
> --  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
> --  sed '=' <$as_myself |
> -+  # 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
> --      s,$,-,
> --      : loop
> --      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
> -+      :loop
> -+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
> -       t loop
> --      s,-$,,
> --      s,^['$as_cr_digits']*\n,,
> -+      s/-\n.*//
> -     ' >$as_me.lineno &&
> --  chmod +x $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 sensible to this).
> --  . ./$as_me.lineno
> -+  # original and so on.  Autoconf is especially sensitive to this).
> -+  . "./$as_me.lineno"
> -   # Exit status is that of the last command.
> -   exit
> - }
> - 
> - 
> --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
> --  *c*,-n*) ECHO_N= ECHO_C='
> --' ECHO_T='	' ;;
> --  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
> --  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
> -+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; then
> -+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
> --  # We could just check for DJGPP; but this test a) works b) is more generic
> --  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
> --  if test -f conf$$.exe; then
> --    # Don't use ln at all; we don't have any links
> -+  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'
> --  else
> --    as_ln_s='ln -s'
> --  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$$.file
> -+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=:
> -@@ -222,7 +518,28 @@
> -   as_mkdir_p=false
> - fi
> - 
> --as_executable_p="test -f"
> -+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'"
> -@@ -231,39 +548,27 @@
> - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
> - 
> - 
> --# IFS
> --# We need space, tab and new line, in precisely that order.
> --as_nl='
> --'
> --IFS=" 	$as_nl"
> --
> --# CDPATH.
> --$as_unset CDPATH
> - 
> -+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`
> - 
> --exec 6>&1
> --
> - #
> - # 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}
> - 
> --# Maximum number of lines to put in a shell here document.
> --# This variable seems obsolete.  It should probably be removed, and
> --# only ac_max_sed_lines should be used.
> --: ${ac_max_here_lines=38}
> --
> - # Identity of this package.
> - PACKAGE_NAME=
> - PACKAGE_TARNAME=
> -@@ -275,42 +580,136 @@
> - # Factoring default headers for most tests.
> - ac_includes_default="\
> - #include <stdio.h>
> --#if HAVE_SYS_TYPES_H
> -+#ifdef HAVE_SYS_TYPES_H
> - # include <sys/types.h>
> - #endif
> --#if HAVE_SYS_STAT_H
> -+#ifdef HAVE_SYS_STAT_H
> - # include <sys/stat.h>
> - #endif
> --#if STDC_HEADERS
> -+#ifdef STDC_HEADERS
> - # include <stdlib.h>
> - # include <stddef.h>
> - #else
> --# if HAVE_STDLIB_H
> -+# ifdef HAVE_STDLIB_H
> - #  include <stdlib.h>
> - # endif
> - #endif
> --#if HAVE_STRING_H
> --# if !STDC_HEADERS && HAVE_MEMORY_H
> -+#ifdef HAVE_STRING_H
> -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
> - #  include <memory.h>
> - # endif
> - # include <string.h>
> - #endif
> --#if HAVE_STRINGS_H
> -+#ifdef HAVE_STRINGS_H
> - # include <strings.h>
> - #endif
> --#if HAVE_INTTYPES_H
> -+#ifdef HAVE_INTTYPES_H
> - # include <inttypes.h>
> --#else
> --# if HAVE_STDINT_H
> --#  include <stdint.h>
> --# endif
> - #endif
> --#if HAVE_UNISTD_H
> -+#ifdef HAVE_STDINT_H
> -+# include <stdint.h>
> -+#endif
> -+#ifdef HAVE_UNISTD_H
> - # include <unistd.h>
> - #endif"
> - 
> --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MKDIR RM CP LN TAR RPM SED FIND CPP EGREP LD ac_ct_LD AS ac_ct_AS OBJCOPY ac_ct_OBJCOPY I386_CC I386_CPP I386_LD I386_AS I386_OBJCOPY IA64_CC IA64_CPP IA64_LD IA64_AS IA64_OBJCOPY HOST_CC HOST_CFLAGS I386_CFLAGS I386_ASFLAGS I386_LDFLAGS IA64_CFLAGS IA64_ASFLAGS IA64_LDFLAGS LIBOBJS LTLIBOBJS'
> -+ac_subst_vars='SHELL
> -+PATH_SEPARATOR
> -+PACKAGE_NAME
> -+PACKAGE_TARNAME
> -+PACKAGE_VERSION
> -+PACKAGE_STRING
> -+PACKAGE_BUGREPORT
> -+exec_prefix
> -+prefix
> -+program_transform_name
> -+bindir
> -+sbindir
> -+libexecdir
> -+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
> -+build
> -+build_cpu
> -+build_vendor
> -+build_os
> -+host
> -+host_cpu
> -+host_vendor
> -+host_os
> -+CC
> -+CFLAGS
> -+LDFLAGS
> -+CPPFLAGS
> -+ac_ct_CC
> -+EXEEXT
> -+OBJEXT
> -+MKDIR
> -+RM
> -+CP
> -+LN
> -+TAR
> -+RPM
> -+SED
> -+FIND
> -+CPP
> -+GREP
> -+EGREP
> -+LD
> -+AS
> -+OBJCOPY
> -+I386_CC
> -+I386_CPP
> -+I386_LD
> -+I386_AS
> -+I386_OBJCOPY
> -+IA64_CC
> -+IA64_CPP
> -+IA64_LD
> -+IA64_AS
> -+IA64_OBJCOPY
> -+HOST_CC
> -+HOST_CFLAGS
> -+I386_CFLAGS
> -+I386_ASFLAGS
> -+I386_LDFLAGS
> -+IA64_CFLAGS
> -+IA64_ASFLAGS
> -+IA64_LDFLAGS
> -+LIBOBJS
> -+LTLIBOBJS'
> - ac_subst_files=''
> -+      ac_precious_vars='build_alias
> -+host_alias
> -+target_alias
> -+CC
> -+CFLAGS
> -+LDFLAGS
> -+LIBS
> -+CPPFLAGS
> -+CPP'
> -+
> - 
> - # Initialize some variables set by options.
> - ac_init_help=
> -@@ -337,34 +736,48 @@
> - # 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'
> --datadir='${prefix}/share'
> -+datarootdir='${prefix}/share'
> -+datadir='${datarootdir}'
> - sysconfdir='${prefix}/etc'
> - sharedstatedir='${prefix}/com'
> - localstatedir='${prefix}/var'
> --libdir='${exec_prefix}/lib'
> - includedir='${prefix}/include'
> - oldincludedir='/usr/include'
> --infodir='${prefix}/info'
> --mandir='${prefix}/man'
> -+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"
> -+    eval $ac_prev=\$ac_option
> -     ac_prev=
> -     continue
> -   fi
> - 
> --  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
> -+  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_option in
> -+  case $ac_dashdash$ac_option in
> -+  --)
> -+    ac_dashdash=yes ;;
> - 
> -   -bindir | --bindir | --bindi | --bind | --bin | --bi)
> -     ac_prev=bindir ;;
> -@@ -386,33 +799,45 @@
> -   --config-cache | -C)
> -     cache_file=config.cache ;;
> - 
> --  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
> -+  -datadir | --datadir | --datadi | --datad)
> -     ac_prev=datadir ;;
> --  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
> --  | --da=*)
> -+  -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 &&
> -+    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" ;;
> -+    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 &&
> -+    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'`
> --    case $ac_option in
> --      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
> --      *) ac_optarg=yes ;;
> --    esac
> --    eval "enable_$ac_feature='$ac_optarg'" ;;
> -+    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- \
> -@@ -439,6 +864,12 @@
> -   -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 ;;
> -@@ -463,13 +894,16 @@
> -   | --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 | --local | --loca | --loc | --lo)
> -+  | --localstate | --localstat | --localsta | --localst | --locals)
> -     ac_prev=localstatedir ;;
> -   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
> --  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
> --  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
> -+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
> -     localstatedir=$ac_optarg ;;
> - 
> -   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
> -@@ -534,6 +968,16 @@
> -   | --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 ;;
> -@@ -586,24 +1030,20 @@
> -   -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 &&
> -+    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'`
> --    case $ac_option in
> --      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
> --      *) ac_optarg=yes ;;
> --    esac
> --    eval "with_$ac_package='$ac_optarg'" ;;
> -+    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 &&
> -+    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" ;;
> -+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
> -+    eval with_$ac_package=no ;;
> - 
> -   --x)
> -     # Obsolete; use --with-x.
> -@@ -634,8 +1074,7 @@
> -     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
> -       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
> -    { (exit 1); exit 1; }; }
> --    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
> --    eval "$ac_envvar='$ac_optarg'"
> -+    eval $ac_envvar=\$ac_optarg
> -     export $ac_envvar ;;
> - 
> -   *)
> -@@ -655,27 +1094,19 @@
> -    { (exit 1); exit 1; }; }
> - fi
> - 
> --# Be sure to have absolute paths.
> --for ac_var in exec_prefix prefix
> --do
> --  eval ac_val=$`echo $ac_var`
> --  case $ac_val in
> --    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
> --    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
> --   { (exit 1); exit 1; }; };;
> --  esac
> --done
> --
> --# Be sure to have absolute paths.
> --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
> --	      localstatedir libdir includedir oldincludedir infodir mandir
> -+# 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=$`echo $ac_var`
> -+  eval ac_val=\$$ac_var
> -   case $ac_val in
> --    [\\/$]* | ?:[\\/]* ) ;;
> --    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
> --   { (exit 1); exit 1; }; };;
> -+    [\\/$]* | ?:[\\/]* )  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'
> -@@ -702,74 +1133,76 @@
> - 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 its parent.
> --  ac_confdir=`(dirname "$0") 2>/dev/null ||
> -+  # 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 ||
> -+	 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'`
> -+    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
> -+  if test ! -r "$srcdir/$ac_unique_file"; then
> -     srcdir=..
> -   fi
> - else
> -   ac_srcdir_defaulted=no
> - fi
> --if test ! -r $srcdir/$ac_unique_file; then
> --  if test "$ac_srcdir_defaulted" = yes; then
> --    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
> --   { (exit 1); exit 1; }; }
> --  else
> --    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
> --   { (exit 1); exit 1; }; }
> --  fi
> --fi
> --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
> --  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
> --   { (exit 1); exit 1; }; }
> --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
> --ac_env_build_alias_set=${build_alias+set}
> --ac_env_build_alias_value=$build_alias
> --ac_cv_env_build_alias_set=${build_alias+set}
> --ac_cv_env_build_alias_value=$build_alias
> --ac_env_host_alias_set=${host_alias+set}
> --ac_env_host_alias_value=$host_alias
> --ac_cv_env_host_alias_set=${host_alias+set}
> --ac_cv_env_host_alias_value=$host_alias
> --ac_env_target_alias_set=${target_alias+set}
> --ac_env_target_alias_value=$target_alias
> --ac_cv_env_target_alias_set=${target_alias+set}
> --ac_cv_env_target_alias_value=$target_alias
> --ac_env_CC_set=${CC+set}
> --ac_env_CC_value=$CC
> --ac_cv_env_CC_set=${CC+set}
> --ac_cv_env_CC_value=$CC
> --ac_env_CFLAGS_set=${CFLAGS+set}
> --ac_env_CFLAGS_value=$CFLAGS
> --ac_cv_env_CFLAGS_set=${CFLAGS+set}
> --ac_cv_env_CFLAGS_value=$CFLAGS
> --ac_env_LDFLAGS_set=${LDFLAGS+set}
> --ac_env_LDFLAGS_value=$LDFLAGS
> --ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
> --ac_cv_env_LDFLAGS_value=$LDFLAGS
> --ac_env_CPPFLAGS_set=${CPPFLAGS+set}
> --ac_env_CPPFLAGS_value=$CPPFLAGS
> --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
> --ac_cv_env_CPPFLAGS_value=$CPPFLAGS
> --ac_env_CPP_set=${CPP+set}
> --ac_env_CPP_value=$CPP
> --ac_cv_env_CPP_set=${CPP+set}
> --ac_cv_env_CPP_value=$CPP
> -+if test ! -r "$srcdir/$ac_unique_file"; then
> -+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
> -+  { 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.
> -@@ -798,9 +1231,6 @@
> -   -n, --no-create         do not create output files
> -       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
> - 
> --_ACEOF
> --
> --  cat <<_ACEOF
> - Installation directories:
> -   --prefix=PREFIX         install architecture-independent files in PREFIX
> - 			  [$ac_default_prefix]
> -@@ -818,15 +1248,22 @@
> -   --bindir=DIR           user executables [EPREFIX/bin]
> -   --sbindir=DIR          system admin executables [EPREFIX/sbin]
> -   --libexecdir=DIR       program executables [EPREFIX/libexec]
> --  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
> -   --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]
> --  --infodir=DIR          info documentation [PREFIX/info]
> --  --mandir=DIR           man documentation [PREFIX/man]
> -+  --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
> -@@ -852,126 +1289,95 @@
> -   CFLAGS      C compiler flags
> -   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
> -               nonstandard directory <lib dir>
> --  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
> --              headers in a nonstandard directory <include 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
> - 
> - 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.
> --  ac_popdir=`pwd`
> -   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
> --    test -d $ac_dir || continue
> -+    test -d "$ac_dir" || continue
> -     ac_builddir=.
> - 
> --if test "$ac_dir" != .; then
> -+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=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
> --else
> --  ac_dir_suffix= ac_top_builddir=
> --fi
> -+  # 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
> --  .)  # No --srcdir option.  We are building in place.
> -+  .)  # We are building in place.
> -     ac_srcdir=.
> --    if test -z "$ac_top_builddir"; then
> --       ac_top_srcdir=.
> --    else
> --       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
> --    fi ;;
> --  [\\/]* | ?:[\\/]* )  # Absolute path.
> -+    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 ;;
> --  *) # Relative path.
> --    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
> --    ac_top_srcdir=$ac_top_builddir$srcdir ;;
> --esac
> --
> --# Do not use `cd foo && pwd` to compute absolute paths, because
> --# the directories may not exist.
> --case `pwd` in
> --.) ac_abs_builddir="$ac_dir";;
> --*)
> --  case "$ac_dir" in
> --  .) ac_abs_builddir=`pwd`;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
> --  *) ac_abs_builddir=`pwd`/"$ac_dir";;
> --  esac;;
> --esac
> --case $ac_abs_builddir in
> --.) ac_abs_top_builddir=${ac_top_builddir}.;;
> --*)
> --  case ${ac_top_builddir}. in
> --  .) ac_abs_top_builddir=$ac_abs_builddir;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
> --  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
> --  esac;;
> --esac
> --case $ac_abs_builddir in
> --.) ac_abs_srcdir=$ac_srcdir;;
> --*)
> --  case $ac_srcdir in
> --  .) ac_abs_srcdir=$ac_abs_builddir;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
> --  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
> --  esac;;
> --esac
> --case $ac_abs_builddir in
> --.) ac_abs_top_srcdir=$ac_top_srcdir;;
> --*)
> --  case $ac_top_srcdir in
> --  .) ac_abs_top_srcdir=$ac_abs_builddir;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
> --  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
> --  esac;;
> -+    ac_top_srcdir=$srcdir
> -+    ac_abs_top_srcdir=$srcdir ;;
> -+  *) # Relative name.
> -+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
> -+    ac_top_srcdir=$ac_top_build_prefix$srcdir
> -+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
> - esac
> -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> - 
> --    cd $ac_dir
> --    # Check for guested configure; otherwise get Cygnus style 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
> --    elif test -f $ac_srcdir/configure.ac ||
> --	   test -f $ac_srcdir/configure.in; then
> --      echo
> --      $ac_configure --help
> -+    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
> --    cd $ac_popdir
> -+    fi || ac_status=$?
> -+    cd "$ac_pwd" || { ac_status=$?; break; }
> -   done
> - fi
> - 
> --test -n "$ac_init_help" && exit 0
> -+test -n "$ac_init_help" && exit $ac_status
> - if $ac_init_version; then
> -   cat <<\_ACEOF
> -+configure
> -+generated by GNU Autoconf 2.61
> - 
> --Copyright (C) 2003 Free Software Foundation, Inc.
> -+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 0
> -+  exit
> - fi
> --exec 5>config.log
> --cat >&5 <<_ACEOF
> -+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.59.  Invocation command line was
> -+generated by GNU Autoconf 2.61.  Invocation command line was
> - 
> -   $ $0 $@
> - 
> - _ACEOF
> -+exec 5>>config.log
> - {
> - cat <<_ASUNAME
> - ## --------- ##
> -@@ -990,7 +1396,7 @@
> - /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`
> --hostinfo               = `(hostinfo) 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`
> -@@ -1004,6 +1410,7 @@
> -   test -z "$as_dir" && as_dir=.
> -   echo "PATH: $as_dir"
> - done
> -+IFS=$as_save_IFS
> - 
> - } >&5
> - 
> -@@ -1025,7 +1432,6 @@
> - ac_configure_args=
> - ac_configure_args0=
> - ac_configure_args1=
> --ac_sep=
> - ac_must_keep_next=false
> - for ac_pass in 1 2
> - do
> -@@ -1036,7 +1442,7 @@
> -     -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
> -@@ -1058,9 +1464,7 @@
> - 	  -* ) ac_must_keep_next=true ;;
> - 	esac
> -       fi
> --      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
> --      # Get rid of the leading space.
> --      ac_sep=" "
> -+      ac_configure_args="$ac_configure_args '$ac_arg'"
> -       ;;
> -     esac
> -   done
> -@@ -1071,8 +1475,8 @@
> - # 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: Be sure not to use single quotes in there, as some shells,
> --# such as our DU 5.0 friend, will then `close' the trap.
> -+# 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.
> -   {
> -@@ -1085,20 +1489,34 @@
> - _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 `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
> --    *ac_space=\ *)
> -+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
> -+    *${as_nl}ac_space=\ *)
> -       sed -n \
> --	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
> --	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
> --      ;;
> -+	"s/'\''/'\''\\\\'\'''\''/g;
> -+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
> -+      ;; #(
> -     *)
> --      sed -n \
> --	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
> -+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
> -       ;;
> --    esac;
> --}
> -+    esac |
> -+    sort
> -+)
> -     echo
> - 
> -     cat <<\_ASBOX
> -@@ -1109,22 +1527,28 @@
> -     echo
> -     for ac_var in $ac_subst_vars
> -     do
> --      eval ac_val=$`echo $ac_var`
> --      echo "$ac_var='"'"'$ac_val'"'"'"
> -+      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
> --## ------------- ##
> --## Output files. ##
> --## ------------- ##
> -+## ------------------- ##
> -+## File substitutions. ##
> -+## ------------------- ##
> - _ASBOX
> -       echo
> -       for ac_var in $ac_subst_files
> -       do
> --	eval ac_val=$`echo $ac_var`
> --	echo "$ac_var='"'"'$ac_val'"'"'"
> -+	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
> -@@ -1136,26 +1560,24 @@
> - ## ----------- ##
> - _ASBOX
> -       echo
> --      sed "/^$/d" confdefs.h | sort
> -+      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 &&
> --  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
> -+  rm -f core *.core core.conftest.* &&
> -+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
> -     exit $exit_status
> --     ' 0
> -+' 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 -rf conftest* confdefs.h
> --# AIX cpp loses on an empty file, so make sure it contains at least a newline.
> --echo >confdefs.h
> -+rm -f -r conftest* confdefs.h
> - 
> - # Predefined preprocessor variables.
> - 
> -@@ -1186,14 +1608,17 @@
> - 
> - # Let the site file select an alternate cache file if it wants to.
> - # Prefer explicitly selected file to automatically selected ones.
> --if test -z "$CONFIG_SITE"; then
> --  if test "x$prefix" != xNONE; then
> --    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
> --  else
> --    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
> --  fi
> -+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
> --for ac_site_file in $CONFIG_SITE; do
> -+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;}
> -@@ -1209,8 +1634,8 @@
> -     { 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;;
> -+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
> -+      *)                      . "./$cache_file";;
> -     esac
> -   fi
> - else
> -@@ -1222,12 +1647,11 @@
> - # Check that the precious variables saved in the cache have kept the same
> - # value.
> - ac_cache_corrupted=false
> --for ac_var in `(set) 2>&1 |
> --	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
> -+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"
> -+  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
> -@@ -1252,8 +1676,7 @@
> -   # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
> -     *) ac_arg=$ac_var=$ac_new_val ;;
> -     esac
> -     case " $ac_configure_args " in
> -@@ -1270,12 +1693,6 @@
> -    { (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
> --
> - 
> - 
> - 
> -@@ -1292,88 +1709,128 @@
> - 
> - 
> - 
> -+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
> -+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
> -+  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
> -+  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;}
> -+  { { 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
> --ac_config_guess="$SHELL $ac_aux_dir/config.guess"
> --ac_config_sub="$SHELL $ac_aux_dir/config.sub"
> --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
> -+
> -+# These three variables are undocumented and unsupported,
> -+# and are intended to be withdrawn in a future Autoconf release.
> -+# They can cause serious problems if a builder's source tree is in a directory
> -+# 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.
> -+
> - 
> - 
> - 
> - 
> - # Make sure we can run config.sub.
> --$ac_config_sub sun4 >/dev/null 2>&1 ||
> --  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
> --echo "$as_me: error: cannot run $ac_config_sub" >&2;}
> -+$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
> -+{ 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_cv_build_alias=$build_alias
> --test -z "$ac_cv_build_alias" &&
> --  ac_cv_build_alias=`$ac_config_guess`
> --test -z "$ac_cv_build_alias" &&
> -+  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=`$ac_config_sub $ac_cv_build_alias` ||
> --  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
> --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
> -+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
> -+{ 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
> --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
> --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
> --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
> -+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
> -+{ 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
> --  ac_cv_host_alias=$host_alias
> --test -z "$ac_cv_host_alias" &&
> --  ac_cv_host_alias=$ac_cv_build_alias
> --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
> --  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
> --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
> -+  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
> -+{ 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
> --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
> --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
> --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
> -+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
> - 
> - 
> - #AC_CANONICAL_TARGET
> -@@ -1391,22 +1848,22 @@
> - targets=""
> - 
> - 
> --# Check whether --with-i386 or --without-i386 was given.
> -+# Check whether --with-i386 was given.
> - if test "${with_i386+set}" = set; then
> --  withval="$with_i386"
> --   if test "withval" = "yes" ; then with_i386="i386"; else with_i386="$withval"; fi
> -+  withval=$with_i386;  if test "withval" = "yes" ; then with_i386="i386"; else with_i386="$withval"; fi
> - else
> -    with_i386="no"
> --fi;
> -+fi
> - 
> - 
> --# Check whether --with-ia64 or --without-ia64 was given.
> -+
> -+# Check whether --with-ia64 was given.
> - if test "${with_ia64+set}" = set; then
> --  withval="$with_ia64"
> --   if test "withval" = "yes" ; then with_ia64="ia64"; else with_ia64="$withval"; fi
> -+  withval=$with_ia64;  if test "withval" = "yes" ; then with_ia64="ia64"; else with_ia64="$withval"; fi
> - else
> -    with_ia64="no"
> --fi;
> -+fi
> -+
> - 
> - with_default="no"
> - if	test "$with_i386" = "no" &&
> -@@ -1430,8 +1887,8 @@
> - 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
> -+{ 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
> -@@ -1444,32 +1901,34 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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
> -+  { 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
> -+  { 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
> -+{ 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
> -@@ -1482,36 +1941,51 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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
> -+  { 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
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> --  CC=$ac_ct_CC
> -+  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.
> -+          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
> -+{ 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
> -@@ -1524,74 +1998,34 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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
> --if test -z "$ac_cv_prog_CC"; then
> --  ac_ct_CC=$CC
> --  # 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_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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> --    ac_cv_prog_ac_ct_CC="cc"
> --    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> --    break 2
> --  fi
> --done
> --done
> --
> --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
> -+  { 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
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> --  CC=$ac_ct_CC
> --else
> --  CC="$ac_cv_prog_CC"
> --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
> -+{ 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
> -@@ -1605,7 +2039,7 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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
> -@@ -1616,6 +2050,7 @@
> -   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.
> -@@ -1633,22 +2068,23 @@
> - fi
> - CC=$ac_cv_prog_CC
> - if test -n "$CC"; then
> --  echo "$as_me:$LINENO: result: $CC" >&5
> --echo "${ECHO_T}$CC" >&6
> -+  { 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
> -+  { 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
> -+  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
> -+{ 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
> -@@ -1661,36 +2097,38 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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
> -+  { 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
> -+  { 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
> -+  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
> -+{ 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
> -@@ -1703,29 +2141,45 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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
> -+  { 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
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> -   test -n "$ac_ct_CC" && break
> - done
> - 
> --  CC=$ac_ct_CC
> -+  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
> -@@ -1738,21 +2192,35 @@
> -    { (exit 1); exit 1; }; }
> - 
> - # Provide some information about the compiler.
> --echo "$as_me:$LINENO:" \
> --     "checking for C compiler version" >&5
> -+echo "$as_me:$LINENO: checking for C compiler version" >&5
> - ac_compiler=`set X $ac_compile; echo $2`
> --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
> --  (eval $ac_compiler --version </dev/null >&5) 2>&5
> -+{ (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); }
> --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
> --  (eval $ac_compiler -v </dev/null >&5) 2>&5
> -+{ (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); }
> --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
> --  (eval $ac_compiler -V </dev/null >&5) 2>&5
> -+{ (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); }
> -@@ -1777,47 +2245,77 @@
> - # 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
> -+{ 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[^ ]*//'`
> --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
> --  (eval $ac_link_default) 2>&5
> -+#
> -+# 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
> --  # Find the output, starting from the most likely.  This scheme is
> --# not robust to junk in `.', hence go to wildcards (a.*) only as a last
> --# resort.
> --
> --# Be careful to initialize this variable, since it used to be cached.
> --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
> --ac_cv_exeext=
> --# b.out is created by i960 compilers.
> --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
> -+  # 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 | *.o | *.obj )
> --	;;
> --    conftest.$ac_ext )
> --	# This is the source file.
> -+    *.$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;;
> -     *.* )
> --	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
> --	# FIXME: I believe we export ac_cv_exeext for Libtool,
> --	# but it would be cool to find out if it's true.  Does anybody
> --	# maintain Libtool? --akim.
> --	export ac_cv_exeext
> -+        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
> - 
> -@@ -1829,19 +2327,21 @@
> - fi
> - 
> - ac_exeext=$ac_cv_exeext
> --echo "$as_me:$LINENO: result: $ac_file" >&5
> --echo "${ECHO_T}$ac_file" >&6
> - 
> --# Check the compiler produces executables we can run.  If not, either
> -+# 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
> -+{ 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'
> --  { (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
> -@@ -1860,22 +2360,27 @@
> -     fi
> -   fi
> - fi
> --echo "$as_me:$LINENO: result: yes" >&5
> --echo "${ECHO_T}yes" >&6
> -+{ 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 the compiler produces executables we can run.  If not, either
> -+# 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
> --  (eval $ac_link) 2>&5
> -+{ 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
> -@@ -1886,9 +2391,8 @@
> - for ac_file in conftest.exe conftest conftest.*; do
> -   test -f "$ac_file" || continue
> -   case $ac_file in
> --    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
> -+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
> -     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
> --	  export ac_cv_exeext
> - 	  break;;
> -     * ) break;;
> -   esac
> -@@ -1902,14 +2406,14 @@
> - fi
> - 
> - rm -f conftest$ac_cv_exeext
> --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
> --echo "${ECHO_T}$ac_cv_exeext" >&6
> -+{ 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
> -+{ 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
> -@@ -1929,14 +2433,20 @@
> - }
> - _ACEOF
> - rm -f conftest.o conftest.obj
> --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> --  (eval $ac_compile) 2>&5
> -+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 `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
> -+  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 ) ;;
> -+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
> -     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
> -        break;;
> -   esac
> -@@ -1954,12 +2464,12 @@
> - 
> - 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
> -+{ 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
> -+{ 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
> -@@ -1982,50 +2492,49 @@
> - }
> - _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_compiler_gnu=yes
> - else
> -   echo "$as_me: failed program was:" >&5
> - sed 's/^/| /' conftest.$ac_ext >&5
> - 
> --ac_compiler_gnu=no
> -+	ac_compiler_gnu=no
> - fi
> --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> -+
> -+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
> -+{ 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
> --CFLAGS="-g"
> --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
> --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
> -+{ 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
> --  cat >conftest.$ac_ext <<_ACEOF
> -+  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
> -@@ -2041,38 +2550,118 @@
> - }
> - _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
> -+  (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); }; } &&
> --	 { ac_try='test -s conftest.$ac_objext'
> --  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
> --  (eval $ac_try) 2>&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); }; }; then
> -+  (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
> - 
> --ac_cv_prog_cc_g=no
> -+
> -+fi
> -+
> -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> - fi
> --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> -+
> -+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
> -+{ 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
> -@@ -2088,12 +2677,12 @@
> -     CFLAGS=
> -   fi
> - fi
> --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
> --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
> --if test "${ac_cv_prog_cc_stdc+set}" = set; then
> -+{ 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_stdc=no
> -+  ac_cv_prog_cc_c89=no
> - ac_save_CC=$CC
> - cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> -@@ -2127,12 +2716,17 @@
> - /* 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 -std1 is added to get
> -+   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 -std1.  */
> -+   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);};
> -@@ -2147,205 +2741,57 @@
> -   return 0;
> - }
> - _ACEOF
> --# Don't try gcc -ansi; that turns off useful extensions and
> --# breaks some systems' header files.
> --# AIX			-qlanglvl=ansi
> --# Ultrix and OSF/1	-std1
> --# HP-UX 10.20 and later	-Ae
> --# HP-UX older versions	-Aa -D_HPUX_SOURCE
> --# SVR4			-Xc -D__EXTENSIONS__
> --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
> -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
> -+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
> - do
> -   CC="$ac_save_CC $ac_arg"
> -   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
> --  ac_cv_prog_cc_stdc=$ac_arg
> --break
> -+  (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 conftest.err conftest.$ac_objext
> -+
> -+rm -f core conftest.err conftest.$ac_objext
> -+  test "x$ac_cv_prog_cc_c89" != "xno" && break
> - done
> --rm -f conftest.$ac_ext conftest.$ac_objext
> -+rm -f conftest.$ac_ext
> - CC=$ac_save_CC
> - 
> - fi
> --
> --case "x$ac_cv_prog_cc_stdc" in
> --  x|xno)
> --    echo "$as_me:$LINENO: result: none needed" >&5
> --echo "${ECHO_T}none needed" >&6 ;;
> -+# 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; } ;;
> -   *)
> --    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
> --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
> --    CC="$CC $ac_cv_prog_cc_stdc" ;;
> -+    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
> - 
> --# Some people use a C++ compiler to compile C.  Since we use `exit',
> --# in C++ we need to declare it.  In case someone uses the same compiler
> --# for both compiling C and C++ we need to have the C++ compiler decide
> --# the declaration of exit, since it's the most demanding environment.
> --cat >conftest.$ac_ext <<_ACEOF
> --#ifndef __cplusplus
> --  choke me
> --#endif
> --_ACEOF
> --rm -f conftest.$ac_objext
> --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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
> --  for ac_declaration in \
> --   '' \
> --   'extern "C" void std::exit (int) throw (); using std::exit;' \
> --   'extern "C" void std::exit (int); using std::exit;' \
> --   'extern "C" void exit (int) throw ();' \
> --   'extern "C" void exit (int);' \
> --   'void exit (int);'
> --do
> --  cat >conftest.$ac_ext <<_ACEOF
> --/* confdefs.h.  */
> --_ACEOF
> --cat confdefs.h >>conftest.$ac_ext
> --cat >>conftest.$ac_ext <<_ACEOF
> --/* end confdefs.h.  */
> --$ac_declaration
> --#include <stdlib.h>
> --int
> --main ()
> --{
> --exit (42);
> --  ;
> --  return 0;
> --}
> --_ACEOF
> --rm -f conftest.$ac_objext
> --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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
> --  :
> --else
> --  echo "$as_me: failed program was:" >&5
> --sed 's/^/| /' conftest.$ac_ext >&5
> - 
> --continue
> --fi
> --rm -f conftest.err conftest.$ac_objext 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.  */
> --$ac_declaration
> --int
> --main ()
> --{
> --exit (42);
> --  ;
> --  return 0;
> --}
> --_ACEOF
> --rm -f conftest.$ac_objext
> --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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
> --  break
> --else
> --  echo "$as_me: failed program was:" >&5
> --sed 's/^/| /' conftest.$ac_ext >&5
> --
> --fi
> --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> --done
> --rm -f conftest*
> --if test -n "$ac_declaration"; then
> --  echo '#ifdef __cplusplus' >>confdefs.h
> --  echo $ac_declaration      >>confdefs.h
> --  echo '#endif'             >>confdefs.h
> --fi
> --
> --else
> --  echo "$as_me: failed program was:" >&5
> --sed 's/^/| /' conftest.$ac_ext >&5
> --
> --fi
> --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> - ac_ext=c
> - ac_cpp='$CPP $CPPFLAGS'
> - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -@@ -2356,8 +2802,8 @@
> - 
> - # Extract the first word of "mkdir", so it can be a program name with args.
> - set dummy mkdir; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_MKDIR+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2370,29 +2816,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_MKDIR="mkdir"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - MKDIR=$ac_cv_prog_MKDIR
> - if test -n "$MKDIR"; then
> --  echo "$as_me:$LINENO: result: $MKDIR" >&5
> --echo "${ECHO_T}$MKDIR" >&6
> -+  { echo "$as_me:$LINENO: result: $MKDIR" >&5
> -+echo "${ECHO_T}$MKDIR" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # 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
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_RM+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2405,29 +2853,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_RM="rm"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - RM=$ac_cv_prog_RM
> - if test -n "$RM"; then
> --  echo "$as_me:$LINENO: result: $RM" >&5
> --echo "${ECHO_T}$RM" >&6
> -+  { 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
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # 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
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_CP+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2440,29 +2890,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_CP="cp"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - CP=$ac_cv_prog_CP
> - if test -n "$CP"; then
> --  echo "$as_me:$LINENO: result: $CP" >&5
> --echo "${ECHO_T}$CP" >&6
> -+  { 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
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # 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
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_LN+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2475,29 +2927,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_LN="ln"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - LN=$ac_cv_prog_LN
> - if test -n "$LN"; then
> --  echo "$as_me:$LINENO: result: $LN" >&5
> --echo "${ECHO_T}$LN" >&6
> -+  { 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
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # Extract the first word of "tar", so it can be a program name with args.
> - set dummy tar; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_TAR+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2510,29 +2964,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_TAR="tar"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - TAR=$ac_cv_prog_TAR
> - if test -n "$TAR"; then
> --  echo "$as_me:$LINENO: result: $TAR" >&5
> --echo "${ECHO_T}$TAR" >&6
> -+  { echo "$as_me:$LINENO: result: $TAR" >&5
> -+echo "${ECHO_T}$TAR" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # Extract the first word of "rpm", so it can be a program name with args.
> - set dummy rpm; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_RPM+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2545,29 +3001,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_RPM="rpm"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - RPM=$ac_cv_prog_RPM
> - if test -n "$RPM"; then
> --  echo "$as_me:$LINENO: result: $RPM" >&5
> --echo "${ECHO_T}$RPM" >&6
> -+  { echo "$as_me:$LINENO: result: $RPM" >&5
> -+echo "${ECHO_T}$RPM" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # 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
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_SED+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2580,29 +3038,31 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_SED="sed"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - SED=$ac_cv_prog_SED
> - if test -n "$SED"; then
> --  echo "$as_me:$LINENO: result: $SED" >&5
> --echo "${ECHO_T}$SED" >&6
> -+  { echo "$as_me:$LINENO: result: $SED" >&5
> -+echo "${ECHO_T}$SED" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - # Extract the first word of "find", so it can be a program name with args.
> - set dummy find; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_FIND+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -2615,33 +3075,35 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_FIND="find"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - FIND=$ac_cv_prog_FIND
> - if test -n "$FIND"; then
> --  echo "$as_me:$LINENO: result: $FIND" >&5
> --echo "${ECHO_T}$FIND" >&6
> -+  { echo "$as_me:$LINENO: result: $FIND" >&5
> -+echo "${ECHO_T}$FIND" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - 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 how to run the C preprocessor" >&5
> --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
> -+{ 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=
> -@@ -2675,24 +3137,22 @@
> - #endif
> - 		     Syntax error
> - _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
> -   :
> - else
> -   echo "$as_me: failed program was:" >&5
> -@@ -2701,9 +3161,10 @@
> -   # Broken: fails on valid input.
> - continue
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> --  # OK, works on sane cases.  Now check whether non-existent headers
> -+  # OK, works on sane cases.  Now check whether nonexistent headers
> -   # can be detected and how.
> -   cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> -@@ -2713,24 +3174,22 @@
> - /* end confdefs.h.  */
> - #include <ac_nonexistent.h>
> - _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
> -   # Broken: success on invalid input.
> - continue
> - else
> -@@ -2741,6 +3200,7 @@
> - ac_preproc_ok=:
> - break
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> - done
> -@@ -2758,8 +3218,8 @@
> - else
> -   ac_cv_prog_CPP=$CPP
> - fi
> --echo "$as_me:$LINENO: result: $CPP" >&5
> --echo "${ECHO_T}$CPP" >&6
> -+{ 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
> -@@ -2782,24 +3242,22 @@
> - #endif
> - 		     Syntax error
> - _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
> -   :
> - else
> -   echo "$as_me: failed program was:" >&5
> -@@ -2808,9 +3266,10 @@
> -   # Broken: fails on valid input.
> - continue
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> --  # OK, works on sane cases.  Now check whether non-existent headers
> -+  # OK, works on sane cases.  Now check whether nonexistent headers
> -   # can be detected and how.
> -   cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> -@@ -2820,24 +3279,22 @@
> - /* end confdefs.h.  */
> - #include <ac_nonexistent.h>
> - _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
> -   # Broken: success on invalid input.
> - continue
> - else
> -@@ -2848,6 +3305,7 @@
> - ac_preproc_ok=:
> - break
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> - done
> -@@ -2870,23 +3328,170 @@
> - ac_compiler_gnu=$ac_cv_c_compiler_gnu
> - 
> - 
> --echo "$as_me:$LINENO: checking for egrep" >&5
> --echo $ECHO_N "checking for egrep... $ECHO_C" >&6
> --if test "${ac_cv_prog_egrep+set}" = set; then
> -+{ 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
> --  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
> --    then ac_cv_prog_egrep='grep -E'
> --    else ac_cv_prog_egrep='egrep'
> -+  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
> --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
> --echo "${ECHO_T}$ac_cv_prog_egrep" >&6
> -- EGREP=$ac_cv_prog_egrep
> - 
> -+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
> - 
> --echo "$as_me:$LINENO: checking for ANSI C header files" >&5
> --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
> -+
> -+   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
> -@@ -2910,35 +3515,31 @@
> - }
> - _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_cv_header_stdc=yes
> - else
> -   echo "$as_me: failed program was:" >&5
> - sed 's/^/| /' conftest.$ac_ext >&5
> - 
> --ac_cv_header_stdc=no
> -+	ac_cv_header_stdc=no
> - fi
> --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> -+
> -+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.
> -@@ -2994,6 +3595,7 @@
> - 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))
> -@@ -3013,18 +3615,27 @@
> -   for (i = 0; i < 256; i++)
> -     if (XOR (islower (i), ISLOWER (i))
> - 	|| toupper (i) != TOUPPER (i))
> --      exit(2);
> --  exit (0);
> -+      return 2;
> -+  return 0;
> - }
> - _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
> -@@ -3037,12 +3648,14 @@
> - ( exit $ac_status )
> - ac_cv_header_stdc=no
> - 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
> -+
> -+
> - fi
> - fi
> --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
> --echo "${ECHO_T}$ac_cv_header_stdc" >&6
> -+{ 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
> -@@ -3065,9 +3678,9 @@
> - 		  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 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
> -   cat >conftest.$ac_ext <<_ACEOF
> -@@ -3081,38 +3694,35 @@
> - #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
> -   eval "$as_ac_Header=yes"
> - else
> -   echo "$as_me: failed program was:" >&5
> - sed 's/^/| /' conftest.$ac_ext >&5
> - 
> --eval "$as_ac_Header=no"
> -+	eval "$as_ac_Header=no"
> - fi
> --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> -+
> -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> - 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; }
> - if test `eval echo '${'$as_ac_Header'}'` = yes; then
> -   cat >>confdefs.h <<_ACEOF
> - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
> -@@ -3124,17 +3734,17 @@
> - 
> - 
> - if test "${ac_cv_header_zlib_h+set}" = set; then
> --  echo "$as_me:$LINENO: checking for zlib.h" >&5
> --echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
> -+  { echo "$as_me:$LINENO: checking for zlib.h" >&5
> -+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
> - if test "${ac_cv_header_zlib_h+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - fi
> --echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
> --echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
> -+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
> -+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
> - else
> -   # Is the header compilable?
> --echo "$as_me:$LINENO: checking zlib.h usability" >&5
> --echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
> -+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
> - cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> - _ACEOF
> -@@ -3145,41 +3755,37 @@
> - #include <zlib.h>
> - _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 zlib.h presence" >&5
> --echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
> -+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
> - cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> - _ACEOF
> -@@ -3188,24 +3794,22 @@
> - /* end confdefs.h.  */
> - #include <zlib.h>
> - _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
> -@@ -3213,9 +3817,10 @@
> - 
> -   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
> -@@ -3239,30 +3844,23 @@
> - echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
> -     { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
> - echo "$as_me: WARNING: zlib.h: 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 zlib.h" >&5
> --echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
> -+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
> - if test "${ac_cv_header_zlib_h+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -   ac_cv_header_zlib_h=$ac_header_preproc
> - fi
> --echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
> --echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
> -+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
> -+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
> - 
> - fi
> - if test $ac_cv_header_zlib_h = yes; then
> --  echo "$as_me:$LINENO: checking for inflateInit_ in -lz" >&5
> --echo $ECHO_N "checking for inflateInit_ in -lz... $ECHO_C" >&6
> -+  { echo "$as_me:$LINENO: checking for inflateInit_ in -lz" >&5
> -+echo $ECHO_N "checking for inflateInit_ in -lz... $ECHO_C" >&6; }
> - if test "${ac_cv_lib_z_inflateInit_+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3276,56 +3874,53 @@
> - cat >>conftest.$ac_ext <<_ACEOF
> - /* end confdefs.h.  */
> - 
> --/* Override any gcc2 internal prototype to avoid an error.  */
> -+/* 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
> --/* We use char because int might match the return type of a gcc2
> --   builtin and then its argument prototype would still apply.  */
> - char inflateInit_ ();
> - int
> - main ()
> - {
> --inflateInit_ ();
> -+return inflateInit_ ();
> -   ;
> -   return 0;
> - }
> - _ACEOF
> - rm -f conftest.$ac_objext conftest$ac_exeext
> --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
> --  (eval $ac_link) 2>conftest.er1
> -+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); } &&
> --	 { ac_try='test -z "$ac_c_werror_flag"
> --			 || test ! -s conftest.err'
> --  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
> --  (eval $ac_try) 2>&5
> --  ac_status=$?
> --  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> --  (exit $ac_status); }; } &&
> --	 { ac_try='test -s conftest$ac_exeext'
> --  { (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_exeext &&
> -+       $as_test_x conftest$ac_exeext; then
> -   ac_cv_lib_z_inflateInit_=yes
> - else
> -   echo "$as_me: failed program was:" >&5
> - sed 's/^/| /' conftest.$ac_ext >&5
> - 
> --ac_cv_lib_z_inflateInit_=no
> -+	ac_cv_lib_z_inflateInit_=no
> - fi
> --rm -f conftest.err conftest.$ac_objext \
> -+
> -+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_z_inflateInit_" >&5
> --echo "${ECHO_T}$ac_cv_lib_z_inflateInit_" >&6
> -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateInit_" >&5
> -+echo "${ECHO_T}$ac_cv_lib_z_inflateInit_" >&6; }
> - if test $ac_cv_lib_z_inflateInit_ = yes; then
> -   cat >>confdefs.h <<\_ACEOF
> - #define HAVE_ZLIB_H 1
> -@@ -3349,8 +3944,8 @@
> - 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
> -+{ 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=
> -@@ -3384,24 +3979,22 @@
> - #endif
> - 		     Syntax error
> - _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
> -   :
> - else
> -   echo "$as_me: failed program was:" >&5
> -@@ -3410,9 +4003,10 @@
> -   # Broken: fails on valid input.
> - continue
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> --  # OK, works on sane cases.  Now check whether non-existent headers
> -+  # OK, works on sane cases.  Now check whether nonexistent headers
> -   # can be detected and how.
> -   cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> -@@ -3422,24 +4016,22 @@
> - /* end confdefs.h.  */
> - #include <ac_nonexistent.h>
> - _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
> -   # Broken: success on invalid input.
> - continue
> - else
> -@@ -3450,6 +4042,7 @@
> - ac_preproc_ok=:
> - break
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> - done
> -@@ -3467,8 +4060,8 @@
> - else
> -   ac_cv_prog_CPP=$CPP
> - fi
> --echo "$as_me:$LINENO: result: $CPP" >&5
> --echo "${ECHO_T}$CPP" >&6
> -+{ 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
> -@@ -3491,24 +4084,22 @@
> - #endif
> - 		     Syntax error
> - _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
> -   :
> - else
> -   echo "$as_me: failed program was:" >&5
> -@@ -3517,9 +4108,10 @@
> -   # Broken: fails on valid input.
> - continue
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> --  # OK, works on sane cases.  Now check whether non-existent headers
> -+  # OK, works on sane cases.  Now check whether nonexistent headers
> -   # can be detected and how.
> -   cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> -@@ -3529,24 +4121,22 @@
> - /* end confdefs.h.  */
> - #include <ac_nonexistent.h>
> - _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
> -   # Broken: success on invalid input.
> - continue
> - else
> -@@ -3557,6 +4147,7 @@
> - ac_preproc_ok=:
> - break
> - fi
> -+
> - rm -f conftest.err conftest.$ac_ext
> - 
> - done
> -@@ -3587,8 +4178,8 @@
> - 	if test -n "$ac_tool_prefix"; then
> -   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
> - set dummy ${ac_tool_prefix}ld; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_LD+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3601,32 +4192,34 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_LD="${ac_tool_prefix}ld"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - LD=$ac_cv_prog_LD
> - if test -n "$LD"; then
> --  echo "$as_me:$LINENO: result: $LD" >&5
> --echo "${ECHO_T}$LD" >&6
> -+  { echo "$as_me:$LINENO: result: $LD" >&5
> -+echo "${ECHO_T}$LD" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - fi
> - if test -z "$ac_cv_prog_LD"; then
> -   ac_ct_LD=$LD
> -   # Extract the first word of "ld", so it can be a program name with args.
> - set dummy ld; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ 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_LD+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3639,27 +4232,41 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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_LD="ld"
> -     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_prog_ac_ct_LD" && ac_cv_prog_ac_ct_LD="no"
> - fi
> - fi
> - ac_ct_LD=$ac_cv_prog_ac_ct_LD
> - if test -n "$ac_ct_LD"; then
> --  echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
> --echo "${ECHO_T}$ac_ct_LD" >&6
> -+  { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
> -+echo "${ECHO_T}$ac_ct_LD" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> --  LD=$ac_ct_LD
> -+  if test "x$ac_ct_LD" = x; then
> -+    LD="no"
> -+  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
> -+    LD=$ac_ct_LD
> -+  fi
> - else
> -   LD="$ac_cv_prog_LD"
> - fi
> -@@ -3673,8 +4280,8 @@
> - 	if test -n "$ac_tool_prefix"; then
> -   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
> - set dummy ${ac_tool_prefix}as; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_AS+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3687,32 +4294,34 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_AS="${ac_tool_prefix}as"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - AS=$ac_cv_prog_AS
> - if test -n "$AS"; then
> --  echo "$as_me:$LINENO: result: $AS" >&5
> --echo "${ECHO_T}$AS" >&6
> -+  { echo "$as_me:$LINENO: result: $AS" >&5
> -+echo "${ECHO_T}$AS" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - fi
> - if test -z "$ac_cv_prog_AS"; then
> -   ac_ct_AS=$AS
> -   # Extract the first word of "as", so it can be a program name with args.
> - set dummy as; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ 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_AS+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3725,27 +4334,41 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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_AS="as"
> -     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_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="no"
> - fi
> - fi
> - ac_ct_AS=$ac_cv_prog_ac_ct_AS
> - if test -n "$ac_ct_AS"; then
> --  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
> --echo "${ECHO_T}$ac_ct_AS" >&6
> -+  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
> -+echo "${ECHO_T}$ac_ct_AS" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> --  AS=$ac_ct_AS
> -+  if test "x$ac_ct_AS" = x; then
> -+    AS="no"
> -+  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
> -+    AS=$ac_ct_AS
> -+  fi
> - else
> -   AS="$ac_cv_prog_AS"
> - fi
> -@@ -3759,8 +4382,8 @@
> - 	if test -n "$ac_tool_prefix"; then
> -   # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
> - set dummy ${ac_tool_prefix}objcopy; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_OBJCOPY+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3773,32 +4396,34 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy"
> -     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> -     break 2
> -   fi
> - done
> - done
> -+IFS=$as_save_IFS
> - 
> - fi
> - fi
> - OBJCOPY=$ac_cv_prog_OBJCOPY
> - if test -n "$OBJCOPY"; then
> --  echo "$as_me:$LINENO: result: $OBJCOPY" >&5
> --echo "${ECHO_T}$OBJCOPY" >&6
> -+  { echo "$as_me:$LINENO: result: $OBJCOPY" >&5
> -+echo "${ECHO_T}$OBJCOPY" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - fi
> - if test -z "$ac_cv_prog_OBJCOPY"; then
> -   ac_ct_OBJCOPY=$OBJCOPY
> -   # Extract the first word of "objcopy", so it can be a program name with args.
> - set dummy objcopy; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ 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_OBJCOPY+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3811,27 +4436,41 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  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_OBJCOPY="objcopy"
> -     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_prog_ac_ct_OBJCOPY" && ac_cv_prog_ac_ct_OBJCOPY="no"
> - fi
> - fi
> - ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
> - if test -n "$ac_ct_OBJCOPY"; then
> --  echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
> --echo "${ECHO_T}$ac_ct_OBJCOPY" >&6
> -+  { echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
> -+echo "${ECHO_T}$ac_ct_OBJCOPY" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> --  OBJCOPY=$ac_ct_OBJCOPY
> -+  if test "x$ac_ct_OBJCOPY" = x; then
> -+    OBJCOPY="no"
> -+  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
> -+    OBJCOPY=$ac_ct_OBJCOPY
> -+  fi
> - else
> -   OBJCOPY="$ac_cv_prog_OBJCOPY"
> - fi
> -@@ -3862,8 +4501,8 @@
> - 	fi
> - 	# 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
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_I386_CC+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3876,26 +4515,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_I386_CC="$cc"
> -     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_prog_I386_CC" && ac_cv_prog_I386_CC=""""
> - fi
> - fi
> - I386_CC=$ac_cv_prog_I386_CC
> - if test -n "$I386_CC"; then
> --  echo "$as_me:$LINENO: result: $I386_CC" >&5
> --echo "${ECHO_T}$I386_CC" >&6
> -+  { echo "$as_me:$LINENO: result: $I386_CC" >&5
> -+echo "${ECHO_T}$I386_CC" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$I386_CC" = no; then
> - 
> - 		{ { echo "$as_me:$LINENO: error: $cc not found" >&5
> -@@ -3904,8 +4545,8 @@
> - 	fi
> - 	# Extract the first word of "$cpp", so it can be a program name with args.
> - set dummy $cpp; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_I386_CPP+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3918,26 +4559,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_I386_CPP="$cpp"
> -     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_prog_I386_CPP" && ac_cv_prog_I386_CPP=""""
> - fi
> - fi
> - I386_CPP=$ac_cv_prog_I386_CPP
> - if test -n "$I386_CPP"; then
> --  echo "$as_me:$LINENO: result: $I386_CPP" >&5
> --echo "${ECHO_T}$I386_CPP" >&6
> -+  { echo "$as_me:$LINENO: result: $I386_CPP" >&5
> -+echo "${ECHO_T}$I386_CPP" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$I386_CPP" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $cpp not found" >&5
> - echo "$as_me: error: $cpp not found" >&2;}
> -@@ -3945,8 +4588,8 @@
> - 	fi
> - 	# Extract the first word of "$ld", so it can be a program name with args.
> - set dummy $ld; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_I386_LD+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -3959,26 +4602,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_I386_LD="$ld"
> -     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_prog_I386_LD" && ac_cv_prog_I386_LD=""""
> - fi
> - fi
> - I386_LD=$ac_cv_prog_I386_LD
> - if test -n "$I386_LD"; then
> --  echo "$as_me:$LINENO: result: $I386_LD" >&5
> --echo "${ECHO_T}$I386_LD" >&6
> -+  { echo "$as_me:$LINENO: result: $I386_LD" >&5
> -+echo "${ECHO_T}$I386_LD" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$I386_AS" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $ld not found" >&5
> - echo "$as_me: error: $ld not found" >&2;}
> -@@ -3986,8 +4631,8 @@
> - 	fi
> - 	# Extract the first word of "$as", so it can be a program name with args.
> - set dummy $as; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_I386_AS+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4000,26 +4645,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_I386_AS="$as"
> -     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_prog_I386_AS" && ac_cv_prog_I386_AS=""""
> - fi
> - fi
> - I386_AS=$ac_cv_prog_I386_AS
> - if test -n "$I386_AS"; then
> --  echo "$as_me:$LINENO: result: $I386_AS" >&5
> --echo "${ECHO_T}$I386_AS" >&6
> -+  { echo "$as_me:$LINENO: result: $I386_AS" >&5
> -+echo "${ECHO_T}$I386_AS" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$I386_AS" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $as not found" >&5
> - echo "$as_me: error: $as not found" >&2;}
> -@@ -4027,8 +4674,8 @@
> - 	fi
> - 	# Extract the first word of "$objcopy", so it can be a program name with args.
> - set dummy $objcopy; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_I386_OBJCOPY+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4041,26 +4688,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_I386_OBJCOPY="$objcopy"
> -     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_prog_I386_OBJCOPY" && ac_cv_prog_I386_OBJCOPY=""""
> - fi
> - fi
> - I386_OBJCOPY=$ac_cv_prog_I386_OBJCOPY
> - if test -n "$I386_OBJCOPY"; then
> --  echo "$as_me:$LINENO: result: $I386_OBJCOPY" >&5
> --echo "${ECHO_T}$I386_OBJCOPY" >&6
> -+  { echo "$as_me:$LINENO: result: $I386_OBJCOPY" >&5
> -+echo "${ECHO_T}$I386_OBJCOPY" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$I386_OBJCOPY" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $objcopy not found" >&5
> - echo "$as_me: error: $objcopy not found" >&2;}
> -@@ -4083,8 +4732,8 @@
> - 	fi
> - 	# 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
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_IA64_CC+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4097,26 +4746,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_IA64_CC="$cc"
> -     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_prog_IA64_CC" && ac_cv_prog_IA64_CC=""""
> - fi
> - fi
> - IA64_CC=$ac_cv_prog_IA64_CC
> - if test -n "$IA64_CC"; then
> --  echo "$as_me:$LINENO: result: $IA64_CC" >&5
> --echo "${ECHO_T}$IA64_CC" >&6
> -+  { echo "$as_me:$LINENO: result: $IA64_CC" >&5
> -+echo "${ECHO_T}$IA64_CC" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$IA64_CC" = no; then
> - 
> - 		{ { echo "$as_me:$LINENO: error: $cc not found" >&5
> -@@ -4125,8 +4776,8 @@
> - 	fi
> - 	# Extract the first word of "$cpp", so it can be a program name with args.
> - set dummy $cpp; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_IA64_CPP+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4139,26 +4790,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_IA64_CPP="$cpp"
> -     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_prog_IA64_CPP" && ac_cv_prog_IA64_CPP=""""
> - fi
> - fi
> - IA64_CPP=$ac_cv_prog_IA64_CPP
> - if test -n "$IA64_CPP"; then
> --  echo "$as_me:$LINENO: result: $IA64_CPP" >&5
> --echo "${ECHO_T}$IA64_CPP" >&6
> -+  { echo "$as_me:$LINENO: result: $IA64_CPP" >&5
> -+echo "${ECHO_T}$IA64_CPP" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$IA64_CPP" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $cpp not found" >&5
> - echo "$as_me: error: $cpp not found" >&2;}
> -@@ -4166,8 +4819,8 @@
> - 	fi
> - 	# Extract the first word of "$ld", so it can be a program name with args.
> - set dummy $ld; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_IA64_LD+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4180,26 +4833,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_IA64_LD="$ld"
> -     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_prog_IA64_LD" && ac_cv_prog_IA64_LD=""""
> - fi
> - fi
> - IA64_LD=$ac_cv_prog_IA64_LD
> - if test -n "$IA64_LD"; then
> --  echo "$as_me:$LINENO: result: $IA64_LD" >&5
> --echo "${ECHO_T}$IA64_LD" >&6
> -+  { echo "$as_me:$LINENO: result: $IA64_LD" >&5
> -+echo "${ECHO_T}$IA64_LD" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$IA64_AS" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $ld not found" >&5
> - echo "$as_me: error: $ld not found" >&2;}
> -@@ -4207,8 +4862,8 @@
> - 	fi
> - 	# Extract the first word of "$as", so it can be a program name with args.
> - set dummy $as; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_IA64_AS+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4221,26 +4876,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_IA64_AS="$as"
> -     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_prog_IA64_AS" && ac_cv_prog_IA64_AS=""""
> - fi
> - fi
> - IA64_AS=$ac_cv_prog_IA64_AS
> - if test -n "$IA64_AS"; then
> --  echo "$as_me:$LINENO: result: $IA64_AS" >&5
> --echo "${ECHO_T}$IA64_AS" >&6
> -+  { echo "$as_me:$LINENO: result: $IA64_AS" >&5
> -+echo "${ECHO_T}$IA64_AS" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$IA64_AS" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $as not found" >&5
> - echo "$as_me: error: $as not found" >&2;}
> -@@ -4248,8 +4905,8 @@
> - 	fi
> - 	# Extract the first word of "$objcopy", so it can be a program name with args.
> - set dummy $objcopy; ac_word=$2
> --echo "$as_me:$LINENO: checking for $ac_word" >&5
> --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
> -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> - if test "${ac_cv_prog_IA64_OBJCOPY+set}" = set; then
> -   echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> -@@ -4262,26 +4919,28 @@
> -   IFS=$as_save_IFS
> -   test -z "$as_dir" && as_dir=.
> -   for ac_exec_ext in '' $ac_executable_extensions; do
> --  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> -+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> -     ac_cv_prog_IA64_OBJCOPY="$objcopy"
> -     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_prog_IA64_OBJCOPY" && ac_cv_prog_IA64_OBJCOPY=""""
> - fi
> - fi
> - IA64_OBJCOPY=$ac_cv_prog_IA64_OBJCOPY
> - if test -n "$IA64_OBJCOPY"; then
> --  echo "$as_me:$LINENO: result: $IA64_OBJCOPY" >&5
> --echo "${ECHO_T}$IA64_OBJCOPY" >&6
> -+  { echo "$as_me:$LINENO: result: $IA64_OBJCOPY" >&5
> -+echo "${ECHO_T}$IA64_OBJCOPY" >&6; }
> - else
> --  echo "$as_me:$LINENO: result: no" >&5
> --echo "${ECHO_T}no" >&6
> -+  { echo "$as_me:$LINENO: result: no" >&5
> -+echo "${ECHO_T}no" >&6; }
> - fi
> - 
> -+
> - 	if test "$IA64_OBJCOPY" = no; then
> - 		{ { echo "$as_me:$LINENO: error: $objcopy not found" >&5
> - echo "$as_me: error: $objcopy not found" >&2;}
> -@@ -4292,13 +4951,13 @@
> - 
> - 
> - HOST_CC=$CC
> --HOST_CFLAGS='-O2 -Wall $(HOST_CPPFLAGS)'
> -+HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)"
> - 
> --I386_CFLAGS='-Os -ffreestanding -Wall -W -Wno-format $(I386_CPPFLAGS)'
> -+I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)"
> - I386_ASFLAGS=''
> - I386_LDFLAGS='-static --warn-multiple-gp --warn-common'
> - 
> --IA64_CFLAGS='-Os -ffreestanding -Wall -W -Wno-format -fpic -mconstant-gp -mauto-pic -fno-unwind-tables $(IA64_CPPFLAGS)'
> -+IA64_CFLAGS="$IA64_CFLAGS -Os -ffreestanding -Wall -W -Wno-format -fpic -mconstant-gp -mauto-pic -fno-unwind-tables \$(IA64_CPPFLAGS)"
> - IA64_ASFLAGS='-mconstant-gp -mauto-pic'
> - IA64_LDFLAGS='-static --warn-multiple-gp --warn-common'
> - 
> -@@ -4323,7 +4982,8 @@
> - 
> - 
> - 
> --          ac_config_files="$ac_config_files Makefile.conf"
> -+ac_config_files="$ac_config_files Makefile.conf"
> -+
> - cat >confcache <<\_ACEOF
> - # This file is a shell script that caches the results of configure
> - # tests run on this system so they can be shared between configure
> -@@ -4342,39 +5002,58 @@
> - 
> - # The following way of writing the cache mishandles newlines in values,
> - # but we know of no workaround that is simple, portable, and efficient.
> --# So, don't put newlines in cache variables' values.
> -+# So, we kill variables containing newlines.
> - # Ultrix sh set writes to stderr and can't be redirected directly,
> - # and sets the high bit in the cache file unless we assign to the vars.
> --{
> -+(
> -+  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 `(ac_space=' '; set | grep ac_space) 2>&1` in
> --    *ac_space=\ *)
> -+    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 \).
> -       sed -n \
> - 	"s/'/'\\\\''/g;
> - 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
> --      ;;
> -+      ;; #(
> -     *)
> -       # `set' quotes correctly as required by POSIX, so do not add quotes.
> --      sed -n \
> --	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
> -+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
> -       ;;
> --    esac;
> --} |
> -+    esac |
> -+    sort
> -+) |
> -   sed '
> -+     /^ac_cv_env_/b end
> -      t clear
> --     : clear
> -+     :clear
> -      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
> -      t end
> --     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
> --     : end' >>confcache
> --if diff $cache_file confcache >/dev/null 2>&1; then :; else
> --  if test -w $cache_file; then
> --    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
> -+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
> -+     :end' >>confcache
> -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
> -+  if test -w "$cache_file"; then
> -+    test "x$cache_file" != "x/dev/null" &&
> -+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
> -+echo "$as_me: updating cache $cache_file" >&6;}
> -     cat confcache >$cache_file
> -   else
> --    echo "not updating unwritable cache $cache_file"
> -+    { 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
> -@@ -4383,63 +5062,48 @@
> - # Let make expand exec_prefix.
> - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
> - 
> --# 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
> --# (actually we leave an empty line to preserve line numbers).
> --if test "x$srcdir" = x.; then
> --  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
> --s/:*\$(srcdir):*/:/;
> --s/:*\${srcdir}:*/:/;
> --s/:*@srcdir@:*/:/;
> --s/^\([^=]*=[	 ]*\):*/\1/;
> --s/:*$//;
> --s/^[^=]*=[	 ]*$//;
> --}'
> --fi
> --
> - # Transform confdefs.h into DEFS.
> - # Protect against shell expansion while executing Makefile rules.
> - # Protect against Makefile macro expansion.
> - #
> - # If the first sed substitution is executed (which looks for macros that
> --# take arguments), then we branch to the quote section.  Otherwise,
> -+# take arguments), then branch to the quote section.  Otherwise,
> - # look for a macro that doesn't take arguments.
> --cat >confdef2opt.sed <<\_ACEOF
> -+ac_script='
> - t clear
> --: clear
> --s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
> -+:clear
> -+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
> - t quote
> --s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
> -+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
> - t quote
> --d
> --: quote
> --s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
> --s,\[,\\&,g
> --s,\],\\&,g
> --s,\$,$$,g
> --p
> --_ACEOF
> --# We use echo to avoid assuming a particular line-breaking character.
> --# The extra dot is to prevent the shell from consuming trailing
> --# line-breaks from the sub-command output.  A line-break within
> --# single-quotes doesn't work because, if this script is created in a
> --# platform that uses two characters for line-breaks (e.g., DOS), tr
> --# would break.
> --ac_LF_and_DOT=`echo; echo .`
> --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
> --rm -f confdef2opt.sed
> -+b any
> -+:quote
> -+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
> -+s/\[/\\&/g
> -+s/\]/\\&/g
> -+s/\$/$$/g
> -+H
> -+:any
> -+${
> -+	g
> -+	s/^\n//
> -+	s/\n/ /g
> -+	p
> -+}
> -+'
> -+DEFS=`sed -n "$ac_script" confdefs.h`
> - 
> - 
> - ac_libobjs=
> - ac_ltlibobjs=
> - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
> -   # 1. Remove the extension, and $U if already installed.
> --  ac_i=`echo "$ac_i" |
> --	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
> --  # 2. Add them.
> --  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
> --  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
> -+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
> -+  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.
> -+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
> -+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
> - done
> - LIBOBJS=$ac_libobjs
> - 
> -@@ -4470,17 +5134,45 @@
> - ## M4sh Initialization.  ##
> - ## --------------------- ##
> - 
> --# Be Bourne compatible
> -+# Be more Bourne compatible
> -+DUALCASE=1; export DUALCASE # for MKS sh
> - 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+"$@"}'='"$@"'
> --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
> --  set -o posix
> -+  setopt NO_GLOB_SUBST
> -+else
> -+  case `(set -o) 2>/dev/null` in
> -+  *posix*) set -o posix ;;
> -+esac
> -+
> -+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
> -+  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
> --DUALCASE=1; export DUALCASE # for MKS sh
> - 
> - # Support unset when possible.
> - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
> -@@ -4490,8 +5182,43 @@
> - fi
> - 
> - 
> -+# IFS
> -+# We need space, tab and new line, in precisely that order.  Quoting is
> -+# 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
> -+  *[\\/]* ) 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
> -+IFS=$as_save_IFS
> -+
> -+     ;;
> -+esac
> -+# We did not find ourselves, most probably we were run as `sh COMMAND'
> -+# in which case we are not to be found in the path.
> -+if test "x$as_myself" = x; then
> -+  as_myself=$0
> -+fi
> -+if test ! -f "$as_myself"; then
> -+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
> -+  { (exit 1); exit 1; }
> -+fi
> -+
> - # Work around bugs in pre-3.0 UWIN ksh.
> --$as_unset ENV MAIL MAILPATH
> -+for as_var in ENV MAIL MAILPATH
> -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
> -+done
> - PS1='$ '
> - PS2='> '
> - PS4='+ '
> -@@ -4505,18 +5232,19 @@
> -   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
> -+    ($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; then
> -+if expr a : '\(a\)' >/dev/null 2>&1 &&
> -+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
> -   as_expr=expr
> - else
> -   as_expr=false
> - fi
> - 
> --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
> -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
> -   as_basename=basename
> - else
> -   as_basename=false
> -@@ -4524,159 +5252,120 @@
> - 
> - 
> - # Name of the executable.
> --as_me=`$as_basename "$0" ||
> -+as_me=`$as_basename -- "$0" ||
> - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
> - 	 X"$0" : 'X\(//\)$' \| \
> --	 X"$0" : 'X\(/\)$' \| \
> --	 .     : '\(.\)' 2>/dev/null ||
> -+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
> - echo X/"$0" |
> --    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
> --  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
> --  	  /^X\/\(\/\).*/{ s//\1/; q; }
> --  	  s/.*/./; q'`
> --
> --
> --# PATH needs CR, and LINENO needs CR and PATH.
> --# 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
> -+    sed '/^.*\/\([^/][^/]*\)\/*$/{
> -+	    s//\1/
> -+	    q
> -+	  }
> -+	  /^X\/\(\/\/\)$/{
> -+	    s//\1/
> -+	    q
> -+	  }
> -+	  /^X\/\(\/\).*/{
> -+	    s//\1/
> -+	    q
> -+	  }
> -+	  s/.*/./; q'`
> - 
> --# 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
> -+# CDPATH.
> -+$as_unset CDPATH
> - 
> - 
> --  as_lineno_1=$LINENO
> --  as_lineno_2=$LINENO
> --  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
> --  test "x$as_lineno_1" != "x$as_lineno_2" &&
> --  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
> --  # Find who we are.  Look in the path if we contain no path at all
> --  # relative or not.
> --  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
> - 
> --       ;;
> --  esac
> --  # We did not find ourselves, most probably we were run as `sh COMMAND'
> --  # in which case we are not to be found in the path.
> --  if test "x$as_myself" = x; then
> --    as_myself=$0
> --  fi
> --  if test ! -f "$as_myself"; then
> --    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
> --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
> --   { (exit 1); exit 1; }; }
> --  fi
> --  case $CONFIG_SHELL in
> --  '')
> --    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=.
> --  for as_base in sh bash ksh sh5; do
> --	 case $as_dir in
> --	 /*)
> --	   if ("$as_dir/$as_base" -c '
> -   as_lineno_1=$LINENO
> -   as_lineno_2=$LINENO
> --  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
> -   test "x$as_lineno_1" != "x$as_lineno_2" &&
> --  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
> --	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
> --	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
> --	     CONFIG_SHELL=$as_dir/$as_base
> --	     export CONFIG_SHELL
> --	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
> --	   fi;;
> --	 esac
> --       done
> --done
> --;;
> --  esac
> -+  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 before each line; the second 'sed' does the real
> --  # work.  The second script uses 'N' to pair each line-number line
> --  # with the numbered line, and appends trailing '-' during
> --  # substitution so that $LINENO is not a special case at line end.
> -+  # 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
> --  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
> --  sed '=' <$as_myself |
> -+  # 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
> --      s,$,-,
> --      : loop
> --      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
> -+      :loop
> -+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
> -       t loop
> --      s,-$,,
> --      s,^['$as_cr_digits']*\n,,
> -+      s/-\n.*//
> -     ' >$as_me.lineno &&
> --  chmod +x $as_me.lineno ||
> --    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
> --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
> -+  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 sensible to this).
> --  . ./$as_me.lineno
> -+  # original and so on.  Autoconf is especially sensitive to this).
> -+  . "./$as_me.lineno"
> -   # Exit status is that of the last command.
> -   exit
> - }
> - 
> - 
> --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
> --  *c*,-n*) ECHO_N= ECHO_C='
> --' ECHO_T='	' ;;
> --  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
> --  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
> -+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; then
> -+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
> --  # We could just check for DJGPP; but this test a) works b) is more generic
> --  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
> --  if test -f conf$$.exe; then
> --    # Don't use ln at all; we don't have any links
> -+  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'
> --  else
> --    as_ln_s='ln -s'
> --  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$$.file
> -+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=:
> -@@ -4685,7 +5374,28 @@
> -   as_mkdir_p=false
> - fi
> - 
> --as_executable_p="test -f"
> -+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'"
> -@@ -4694,31 +5404,14 @@
> - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
> - 
> - 
> --# IFS
> --# We need space, tab and new line, in precisely that order.
> --as_nl='
> --'
> --IFS=" 	$as_nl"
> --
> --# CDPATH.
> --$as_unset CDPATH
> --
> - exec 6>&1
> - 
> --# Open the log real soon, to keep \$[0] and so on meaningful, and to
> -+# 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.  Logging --version etc. is OK.
> --exec 5>>config.log
> --{
> --  echo
> --  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
> --## Running $as_me. ##
> --_ASBOX
> --} >&5
> --cat >&5 <<_CSEOF
> --
> -+# values after options handling.
> -+ac_log="
> - This file was extended by $as_me, which was
> --generated by GNU Autoconf 2.59.  Invocation command line was
> -+generated by GNU Autoconf 2.61.  Invocation command line was
> - 
> -   CONFIG_FILES    = $CONFIG_FILES
> -   CONFIG_HEADERS  = $CONFIG_HEADERS
> -@@ -4726,30 +5419,18 @@
> -   CONFIG_COMMANDS = $CONFIG_COMMANDS
> -   $ $0 $@
> - 
> --_CSEOF
> --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
> --echo >&5
> -+on `(hostname || uname -n) 2>/dev/null | sed 1q`
> -+"
> -+
> - _ACEOF
> - 
> -+cat >>$CONFIG_STATUS <<_ACEOF
> - # Files that config.status was made for.
> --if test -n "$ac_config_files"; then
> --  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
> --fi
> --
> --if test -n "$ac_config_headers"; then
> --  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
> --fi
> -+config_files="$ac_config_files"
> - 
> --if test -n "$ac_config_links"; then
> --  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
> --fi
> --
> --if test -n "$ac_config_commands"; then
> --  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
> --fi
> -+_ACEOF
> - 
> - cat >>$CONFIG_STATUS <<\_ACEOF
> --
> - ac_cs_usage="\
> - \`$as_me' instantiates files from templates according to the
> - current configuration.
> -@@ -4757,7 +5438,7 @@
> - Usage: $0 [OPTIONS] [FILE]...
> - 
> -   -h, --help       print this help, then exit
> --  -V, --version    print version number, then exit
> -+  -V, --version    print version number and configuration settings, then exit
> -   -q, --quiet      do not print progress messages
> -   -d, --debug      don't remove temporary files
> -       --recheck    update $as_me by reconfiguring in the same conditions
> -@@ -4768,18 +5449,20 @@
> - $config_files
> - 
> - Report bugs to <bug-autoconf at gnu.org>."
> --_ACEOF
> - 
> -+_ACEOF
> - cat >>$CONFIG_STATUS <<_ACEOF
> - ac_cs_version="\\
> - config.status
> --configured by $0, generated by GNU Autoconf 2.59,
> --  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
> -+configured by $0, generated by GNU Autoconf 2.61,
> -+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
> - 
> --Copyright (C) 2003 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."
> --srcdir=$srcdir
> -+
> -+ac_pwd='$ac_pwd'
> -+srcdir='$srcdir'
> - _ACEOF
> - 
> - cat >>$CONFIG_STATUS <<\_ACEOF
> -@@ -4790,60 +5473,42 @@
> - do
> -   case $1 in
> -   --*=*)
> --    ac_option=`expr "x$1" : 'x\([^=]*\)='`
> --    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
> -+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
> -+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
> -     ac_shift=:
> -     ;;
> --  -*)
> -+  *)
> -     ac_option=$1
> -     ac_optarg=$2
> -     ac_shift=shift
> -     ;;
> --  *) # This is not an option, so the user has probably given explicit
> --     # arguments.
> --     ac_option=$1
> --     ac_need_defaults=false;;
> -   esac
> - 
> -   case $ac_option in
> -   # Handling of the options.
> --_ACEOF
> --cat >>$CONFIG_STATUS <<\_ACEOF
> -   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
> -     ac_cs_recheck=: ;;
> --  --version | --vers* | -V )
> --    echo "$ac_cs_version"; exit 0 ;;
> --  --he | --h)
> --    # Conflict between --help and --header
> --    { { echo "$as_me:$LINENO: error: ambiguous option: $1
> --Try \`$0 --help' for more information." >&5
> --echo "$as_me: error: ambiguous option: $1
> --Try \`$0 --help' for more information." >&2;}
> --   { (exit 1); exit 1; }; };;
> --  --help | --hel | -h )
> --    echo "$ac_cs_usage"; exit 0 ;;
> --  --debug | --d* | -d )
> -+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
> -+    echo "$ac_cs_version"; exit ;;
> -+  --debug | --debu | --deb | --de | --d | -d )
> -     debug=: ;;
> -   --file | --fil | --fi | --f )
> -     $ac_shift
> -     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
> -     ac_need_defaults=false;;
> --  --header | --heade | --head | --hea )
> --    $ac_shift
> --    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
> --    ac_need_defaults=false;;
> -+  --he | --h |  --help | --hel | -h )
> -+    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.
> --  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
> --Try \`$0 --help' for more information." >&5
> --echo "$as_me: error: unrecognized option: $1
> --Try \`$0 --help' for more information." >&2;}
> -+  -*) { echo "$as_me: error: unrecognized option: $1
> -+Try \`$0 --help' for more information." >&2
> -    { (exit 1); exit 1; }; } ;;
> - 
> --  *) ac_config_targets="$ac_config_targets $1" ;;
> -+  *) ac_config_targets="$ac_config_targets $1"
> -+     ac_need_defaults=false ;;
> - 
> -   esac
> -   shift
> -@@ -4859,28 +5524,42 @@
> - _ACEOF
> - cat >>$CONFIG_STATUS <<_ACEOF
> - if \$ac_cs_recheck; then
> --  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
> --  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
> -+  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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
> - fi
> - 
> - _ACEOF
> -+cat >>$CONFIG_STATUS <<\_ACEOF
> -+exec 5>>config.log
> -+{
> -+  echo
> -+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
> -+## Running $as_me. ##
> -+_ASBOX
> -+  echo "$ac_log"
> -+} >&5
> - 
> --
> --
> --
> -+_ACEOF
> -+cat >>$CONFIG_STATUS <<_ACEOF
> -+_ACEOF
> - 
> - cat >>$CONFIG_STATUS <<\_ACEOF
> -+
> -+# Handling of arguments.
> - for ac_config_target in $ac_config_targets
> - do
> --  case "$ac_config_target" in
> --  # Handling of arguments.
> --  "Makefile.conf" ) CONFIG_FILES="$CONFIG_FILES Makefile.conf" ;;
> -+  case $ac_config_target in
> -+    "Makefile.conf") CONFIG_FILES="$CONFIG_FILES Makefile.conf" ;;
> -+
> -   *) { { 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
> - 
> -+
> - # If the user did not use the arguments to specify the items to instantiate,
> - # then the envvar interface is used.  Set only those that are not.
> - # We use the long form for the default assignment because of an extremely
> -@@ -4890,360 +5569,436 @@
> - fi
> - 
> - # Have a temporary directory for convenience.  Make it in the build tree
> --# simply because there is no reason to put it here, and in addition,
> -+# simply because there is no reason against having it here, and in addition,
> - # creating and moving files from /tmp can sometimes cause problems.
> --# Create a temporary directory, and hook for its removal unless debugging.
> -+# Hook for its removal unless debugging.
> -+# Note that there is a small window in which the directory will not be cleaned:
> -+# after its creation but before its name has been assigned to `$tmp'.
> - $debug ||
> - {
> --  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
> -+  tmp=
> -+  trap 'exit_status=$?
> -+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
> -+' 0
> -   trap '{ (exit 1); exit 1; }' 1 2 13 15
> - }
> --
> - # Create a (secure) tmp directory for tmp files.
> - 
> - {
> --  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
> -+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
> -   test -n "$tmp" && test -d "$tmp"
> - }  ||
> - {
> --  tmp=./confstat$$-$RANDOM
> --  (umask 077 && mkdir $tmp)
> -+  tmp=./conf$$-$RANDOM
> -+  (umask 077 && mkdir "$tmp")
> - } ||
> - {
> -    echo "$me: cannot create a temporary directory in ." >&2
> -    { (exit 1); exit 1; }
> - }
> - 
> --_ACEOF
> --
> --cat >>$CONFIG_STATUS <<_ACEOF
> --
> - #
> --# CONFIG_FILES section.
> -+# Set up the sed scripts for CONFIG_FILES section.
> - #
> - 
> - # No need to generate the scripts if there are no CONFIG_FILES.
> - # This happens for instance when ./config.status config.h
> --if test -n "\$CONFIG_FILES"; then
> --  # Protect against being on the right side of a sed subst in config.status.
> --  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
> --   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
> --s, at SHELL@,$SHELL,;t t
> --s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
> --s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
> --s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
> --s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
> --s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
> --s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
> --s, at exec_prefix@,$exec_prefix,;t t
> --s, at prefix@,$prefix,;t t
> --s, at program_transform_name@,$program_transform_name,;t t
> --s, at bindir@,$bindir,;t t
> --s, at sbindir@,$sbindir,;t t
> --s, at libexecdir@,$libexecdir,;t t
> --s, at datadir@,$datadir,;t t
> --s, at sysconfdir@,$sysconfdir,;t t
> --s, at sharedstatedir@,$sharedstatedir,;t t
> --s, at localstatedir@,$localstatedir,;t t
> --s, at libdir@,$libdir,;t t
> --s, at includedir@,$includedir,;t t
> --s, at oldincludedir@,$oldincludedir,;t t
> --s, at infodir@,$infodir,;t t
> --s, at mandir@,$mandir,;t t
> --s, at build_alias@,$build_alias,;t t
> --s, at host_alias@,$host_alias,;t t
> --s, at target_alias@,$target_alias,;t t
> --s, at DEFS@,$DEFS,;t t
> --s, at ECHO_C@,$ECHO_C,;t t
> --s, at ECHO_N@,$ECHO_N,;t t
> --s, at ECHO_T@,$ECHO_T,;t t
> --s, at LIBS@,$LIBS,;t t
> --s, at build@,$build,;t t
> --s, at build_cpu@,$build_cpu,;t t
> --s, at build_vendor@,$build_vendor,;t t
> --s, at build_os@,$build_os,;t t
> --s, at host@,$host,;t t
> --s, at host_cpu@,$host_cpu,;t t
> --s, at host_vendor@,$host_vendor,;t t
> --s, at host_os@,$host_os,;t t
> --s, at CC@,$CC,;t t
> --s, at CFLAGS@,$CFLAGS,;t t
> --s, at LDFLAGS@,$LDFLAGS,;t t
> --s, at CPPFLAGS@,$CPPFLAGS,;t t
> --s, at ac_ct_CC@,$ac_ct_CC,;t t
> --s, at EXEEXT@,$EXEEXT,;t t
> --s, at OBJEXT@,$OBJEXT,;t t
> --s, at MKDIR@,$MKDIR,;t t
> --s, at RM@,$RM,;t t
> --s, at CP@,$CP,;t t
> --s, at LN@,$LN,;t t
> --s, at TAR@,$TAR,;t t
> --s, at RPM@,$RPM,;t t
> --s, at SED@,$SED,;t t
> --s, at FIND@,$FIND,;t t
> --s, at CPP@,$CPP,;t t
> --s, at EGREP@,$EGREP,;t t
> --s, at LD@,$LD,;t t
> --s, at ac_ct_LD@,$ac_ct_LD,;t t
> --s, at AS@,$AS,;t t
> --s, at ac_ct_AS@,$ac_ct_AS,;t t
> --s, at OBJCOPY@,$OBJCOPY,;t t
> --s, at ac_ct_OBJCOPY@,$ac_ct_OBJCOPY,;t t
> --s, at I386_CC@,$I386_CC,;t t
> --s, at I386_CPP@,$I386_CPP,;t t
> --s, at I386_LD@,$I386_LD,;t t
> --s, at I386_AS@,$I386_AS,;t t
> --s, at I386_OBJCOPY@,$I386_OBJCOPY,;t t
> --s, at IA64_CC@,$IA64_CC,;t t
> --s, at IA64_CPP@,$IA64_CPP,;t t
> --s, at IA64_LD@,$IA64_LD,;t t
> --s, at IA64_AS@,$IA64_AS,;t t
> --s, at IA64_OBJCOPY@,$IA64_OBJCOPY,;t t
> --s, at HOST_CC@,$HOST_CC,;t t
> --s, at HOST_CFLAGS@,$HOST_CFLAGS,;t t
> --s, at I386_CFLAGS@,$I386_CFLAGS,;t t
> --s, at I386_ASFLAGS@,$I386_ASFLAGS,;t t
> --s, at I386_LDFLAGS@,$I386_LDFLAGS,;t t
> --s, at IA64_CFLAGS@,$IA64_CFLAGS,;t t
> --s, at IA64_ASFLAGS@,$IA64_ASFLAGS,;t t
> --s, at IA64_LDFLAGS@,$IA64_LDFLAGS,;t t
> --s, at LIBOBJS@,$LIBOBJS,;t t
> --s, at LTLIBOBJS@,$LTLIBOBJS,;t t
> --CEOF
> --
> --_ACEOF
> --
> --  cat >>$CONFIG_STATUS <<\_ACEOF
> --  # Split the substitutions into bite-sized pieces for seds with
> --  # small command number limits, like on Digital OSF/1 and HP-UX.
> --  ac_max_sed_lines=48
> --  ac_sed_frag=1 # Number of current file.
> --  ac_beg=1 # First line for current file.
> --  ac_end=$ac_max_sed_lines # Line after last line for current file.
> --  ac_more_lines=:
> --  ac_sed_cmds=
> --  while $ac_more_lines; do
> --    if test $ac_beg -gt 1; then
> --      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
> --    else
> --      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
> --    fi
> --    if test ! -s $tmp/subs.frag; then
> --      ac_more_lines=false
> --    else
> --      # The purpose of the label and of the branching condition is to
> --      # speed up the sed processing (if there are no `@' at all, there
> --      # is no need to browse any of the substitutions).
> --      # These are the two extra sed commands mentioned above.
> --      (echo ':t
> --  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
> --      if test -z "$ac_sed_cmds"; then
> --	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
> --      else
> --	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
> --      fi
> --      ac_sed_frag=`expr $ac_sed_frag + 1`
> --      ac_beg=$ac_end
> --      ac_end=`expr $ac_end + $ac_max_sed_lines`
> --    fi
> --  done
> --  if test -z "$ac_sed_cmds"; then
> --    ac_sed_cmds=cat
> -+if test -n "$CONFIG_FILES"; then
> -+
> -+_ACEOF
> -+
> -+
> -+
> -+ac_delim='%!_!# '
> -+for ac_last_try in false false false false false :; do
> -+  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
> -+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
> -+MKDIR!$MKDIR$ac_delim
> -+RM!$RM$ac_delim
> -+CP!$CP$ac_delim
> -+LN!$LN$ac_delim
> -+TAR!$TAR$ac_delim
> -+RPM!$RPM$ac_delim
> -+SED!$SED$ac_delim
> -+FIND!$FIND$ac_delim
> -+CPP!$CPP$ac_delim
> -+GREP!$GREP$ac_delim
> -+EGREP!$EGREP$ac_delim
> -+LD!$LD$ac_delim
> -+AS!$AS$ac_delim
> -+OBJCOPY!$OBJCOPY$ac_delim
> -+I386_CC!$I386_CC$ac_delim
> -+I386_CPP!$I386_CPP$ac_delim
> -+I386_LD!$I386_LD$ac_delim
> -+I386_AS!$I386_AS$ac_delim
> -+I386_OBJCOPY!$I386_OBJCOPY$ac_delim
> -+IA64_CC!$IA64_CC$ac_delim
> -+IA64_CPP!$IA64_CPP$ac_delim
> -+IA64_LD!$IA64_LD$ac_delim
> -+IA64_AS!$IA64_AS$ac_delim
> -+IA64_OBJCOPY!$IA64_OBJCOPY$ac_delim
> -+HOST_CC!$HOST_CC$ac_delim
> -+HOST_CFLAGS!$HOST_CFLAGS$ac_delim
> -+I386_CFLAGS!$I386_CFLAGS$ac_delim
> -+I386_ASFLAGS!$I386_ASFLAGS$ac_delim
> -+I386_LDFLAGS!$I386_LDFLAGS$ac_delim
> -+IA64_CFLAGS!$IA64_CFLAGS$ac_delim
> -+IA64_ASFLAGS!$IA64_ASFLAGS$ac_delim
> -+IA64_LDFLAGS!$IA64_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` = 86; 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
> --fi # test -n "$CONFIG_FILES"
> -+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-1.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
> -+
> -+
> -+# 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
> -+# (actually we leave an empty line to preserve line numbers).
> -+if test "x$srcdir" = x.; then
> -+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
> -+s/:*\$(srcdir):*/:/
> -+s/:*\${srcdir}:*/:/
> -+s/:*@srcdir@:*/:/
> -+s/^\([^=]*=[	 ]*\):*/\1/
> -+s/:*$//
> -+s/^[^=]*=[	 ]*$//
> -+}'
> -+fi
> -+
> - cat >>$CONFIG_STATUS <<\_ACEOF
> --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
> --  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
> --  case $ac_file in
> --  - | *:- | *:-:* ) # input from stdin
> --	cat >$tmp/stdin
> --	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
> --	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
> --  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
> --	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
> --  * )   ac_file_in=$ac_file.in ;;
> -+fi # test -n "$CONFIG_FILES"
> -+
> -+
> -+for ac_tag in  :F $CONFIG_FILES
> -+do
> -+  case $ac_tag in
> -+  :[FHLC]) ac_mode=$ac_tag; continue;;
> -   esac
> -+  case $ac_mode$ac_tag in
> -+  :[FHL]*:*);;
> -+  :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
> -+  ac_save_IFS=$IFS
> -+  IFS=:
> -+  set x $ac_tag
> -+  IFS=$ac_save_IFS
> -+  shift
> -+  ac_file=$1
> -+  shift
> -+
> -+  case $ac_mode in
> -+  :L) ac_source=$1;;
> -+  :[FH])
> -+    ac_file_inputs=
> -+    for ac_f
> -+    do
> -+      case $ac_f in
> -+      -) ac_f="$tmp/stdin";;
> -+      *) # Look for the file first in the build tree, then in the source tree
> -+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
> -+	 # because $ac_f cannot contain `:'.
> -+	 test -f "$ac_f" ||
> -+	   case $ac_f in
> -+	   [\\/$]*) false;;
> -+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
> -+	   esac ||
> -+	   { { 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
> -+      ac_file_inputs="$ac_file_inputs $ac_f"
> -+    done
> - 
> --  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
> --  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
> -+    # 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 "`IFS=:
> -+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
> -+    if test x"$ac_file" != x-; then
> -+      configure_input="$ac_file.  $configure_input"
> -+      { echo "$as_me:$LINENO: creating $ac_file" >&5
> -+echo "$as_me: creating $ac_file" >&6;}
> -+    fi
> -+
> -+    case $ac_tag in
> -+    *:-:* | *:-) cat >"$tmp/stdin";;
> -+    esac
> -+    ;;
> -+  esac
> -+
> -+  ac_dir=`$as_dirname -- "$ac_file" ||
> - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
> - 	 X"$ac_file" : 'X\(//\)[^/]' \| \
> - 	 X"$ac_file" : 'X\(//\)$' \| \
> --	 X"$ac_file" : 'X\(/\)' \| \
> --	 .     : '\(.\)' 2>/dev/null ||
> -+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
> - echo X"$ac_file" |
> --    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
> --  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
> --  	  /^X\(\/\/\)$/{ s//\1/; q; }
> --  	  /^X\(\/\).*/{ s//\1/; q; }
> --  	  s/.*/./; q'`
> --  { if $as_mkdir_p; then
> --    mkdir -p "$ac_dir"
> --  else
> --    as_dir="$ac_dir"
> -+    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 test ! -d "$as_dir"; do
> --      as_dirs="$as_dir $as_dirs"
> --      as_dir=`(dirname "$as_dir") 2>/dev/null ||
> -+    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 ||
> -+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
> - echo X"$as_dir" |
> --    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
> --  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
> --  	  /^X\(\/\/\)$/{ s//\1/; q; }
> --  	  /^X\(\/\).*/{ s//\1/; q; }
> --  	  s/.*/./; q'`
> -+    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 ! -n "$as_dirs" || mkdir $as_dirs
> --  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
> --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
> -+    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=.
> - 
> --if test "$ac_dir" != .; then
> -+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=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
> --else
> --  ac_dir_suffix= ac_top_builddir=
> --fi
> -+  # 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
> --  .)  # No --srcdir option.  We are building in place.
> -+  .)  # We are building in place.
> -     ac_srcdir=.
> --    if test -z "$ac_top_builddir"; then
> --       ac_top_srcdir=.
> --    else
> --       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
> --    fi ;;
> --  [\\/]* | ?:[\\/]* )  # Absolute path.
> -+    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 ;;
> --  *) # Relative path.
> --    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
> --    ac_top_srcdir=$ac_top_builddir$srcdir ;;
> --esac
> --
> --# Do not use `cd foo && pwd` to compute absolute paths, because
> --# the directories may not exist.
> --case `pwd` in
> --.) ac_abs_builddir="$ac_dir";;
> --*)
> --  case "$ac_dir" in
> --  .) ac_abs_builddir=`pwd`;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
> --  *) ac_abs_builddir=`pwd`/"$ac_dir";;
> --  esac;;
> --esac
> --case $ac_abs_builddir in
> --.) ac_abs_top_builddir=${ac_top_builddir}.;;
> --*)
> --  case ${ac_top_builddir}. in
> --  .) ac_abs_top_builddir=$ac_abs_builddir;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
> --  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
> --  esac;;
> --esac
> --case $ac_abs_builddir in
> --.) ac_abs_srcdir=$ac_srcdir;;
> --*)
> --  case $ac_srcdir in
> --  .) ac_abs_srcdir=$ac_abs_builddir;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
> --  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
> --  esac;;
> --esac
> --case $ac_abs_builddir in
> --.) ac_abs_top_srcdir=$ac_top_srcdir;;
> --*)
> --  case $ac_top_srcdir in
> --  .) ac_abs_top_srcdir=$ac_abs_builddir;;
> --  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
> --  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
> --  esac;;
> -+    ac_top_srcdir=$srcdir
> -+    ac_abs_top_srcdir=$srcdir ;;
> -+  *) # Relative name.
> -+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
> -+    ac_top_srcdir=$ac_top_build_prefix$srcdir
> -+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
> - esac
> -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> - 
> - 
> -+  case $ac_mode in
> -+  :F)
> -+  #
> -+  # CONFIG_FILE
> -+  #
> - 
> --  if test x"$ac_file" != x-; then
> --    { echo "$as_me:$LINENO: creating $ac_file" >&5
> --echo "$as_me: creating $ac_file" >&6;}
> --    rm -f "$ac_file"
> --  fi
> --  # 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.  */
> --  if test x"$ac_file" = x-; then
> --    configure_input=
> --  else
> --    configure_input="$ac_file.  "
> --  fi
> --  configure_input=$configure_input"Generated from `echo $ac_file_in |
> --				     sed 's,.*/,,'` by configure."
> -+_ACEOF
> - 
> --  # First look for the input files in the build tree, otherwise in the
> --  # src tree.
> --  ac_file_inputs=`IFS=:
> --    for f in $ac_file_in; do
> --      case $f in
> --      -) echo $tmp/stdin ;;
> --      [\\/$]*)
> --	 # Absolute (can't be DOS-style, as IFS=:)
> --	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
> --echo "$as_me: error: cannot find input file: $f" >&2;}
> --   { (exit 1); exit 1; }; }
> --	 echo "$f";;
> --      *) # Relative
> --	 if test -f "$f"; then
> --	   # Build tree
> --	   echo "$f"
> --	 elif test -f "$srcdir/$f"; then
> --	   # Source tree
> --	   echo "$srcdir/$f"
> --	 else
> --	   # /dev/null tree
> --	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
> --echo "$as_me: error: cannot find input file: $f" >&2;}
> --   { (exit 1); exit 1; }; }
> --	 fi;;
> --      esac
> --    done` || { (exit 1); exit 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=
> -+
> -+case `sed -n '/datarootdir/ {
> -+  p
> -+  q
> -+}
> -+/@datadir@/p
> -+/@docdir@/p
> -+/@infodir@/p
> -+/@localedir@/p
> -+/@mandir@/p
> -+' $ac_file_inputs` in
> -+*datarootdir*) ac_datarootdir_seen=yes;;
> -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
> -+  { 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_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' ;;
> -+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
> -   sed "$ac_vpsub
> - $extrasub
> - _ACEOF
> - cat >>$CONFIG_STATUS <<\_ACEOF
> - :t
> - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
> --s, at configure_input@,$configure_input,;t t
> --s, at srcdir@,$ac_srcdir,;t t
> --s, at abs_srcdir@,$ac_abs_srcdir,;t t
> --s, at top_srcdir@,$ac_top_srcdir,;t t
> --s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
> --s, at builddir@,$ac_builddir,;t t
> --s, at abs_builddir@,$ac_abs_builddir,;t t
> --s, at top_builddir@,$ac_top_builddir,;t t
> --s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
> --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
> --  rm -f $tmp/stdin
> --  if test x"$ac_file" != x-; then
> --    mv $tmp/out $ac_file
> --  else
> --    cat $tmp/out
> --    rm -f $tmp/out
> --  fi
> -+s&@configure_input@&$configure_input&;t t
> -+s&@top_builddir@&$ac_top_builddir_sub&;t t
> -+s&@srcdir@&$ac_srcdir&;t t
> -+s&@abs_srcdir@&$ac_abs_srcdir&;t t
> -+s&@top_srcdir@&$ac_top_srcdir&;t t
> -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
> -+s&@builddir@&$ac_builddir&;t t
> -+s&@abs_builddir@&$ac_abs_builddir&;t t
> -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
> -+$ac_datarootdir_hack
> -+" $ac_file_inputs | sed -f "$tmp/subs-1.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"; } &&
> -+  { 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
> -+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;}
> - 
> --done
> --_ACEOF
> -+  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
> -+ ;;
> -+
> -+
> -+
> -+  esac
> -+
> -+done # for ac_tag
> - 
> --cat >>$CONFIG_STATUS <<\_ACEOF
> - 
> - { (exit 0); exit 0; }
> - _ACEOF

> --
> coreboot mailing list
> coreboot at coreboot.org
> http://www.coreboot.org/mailman/listinfo/coreboot


-- 
Jordan Crouse
Systems Software Development Engineer 
Advanced Micro Devices, Inc.





More information about the coreboot mailing list