rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

1 files changed, 0 insertions, 4809 deletions

diff --git a/packages/gcc/gcc-4.3.1/debian/ada-libgnatprj.dpatch b/packages/gcc/gcc-4.3.1/debian/ada-libgnatprj.dpatch
deleted file mode 100644
index dcbf30aef7..0000000000
--- a/packages/gcc/gcc-4.3.1/debian/ada-libgnatprj.dpatch
+++ /dev/null
@@ -1,4809 +0,0 @@
-#! /bin/sh -e
-
-# DP: - Introduce a new shared library named libgnatprj, containing
-# DP:   the GNAT project file manager licensed under the pure GPL, for
-# DP:   use in GNAT tools, GLADE and GPS.  Link the GNAT tools against
-# DP:   this new library.
-
-# This patch seems large, but the hunks in Makefile.in are actually
-# generated from Makefile.def using autogen.
-
-# !!! Must be applied after ada-libgnatvsn.dpatch
-
-dir=./
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-	cd ${dir} && autoconf
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
-Index: gcc/ada/config-lang.in
-===================================================================
---- gcc/ada/config-lang.in.orig
-+++ gcc/ada/config-lang.in
-@@ -34,8 +34,8 @@
- 
- outputs=ada/Makefile
- 
--target_libs="target-libada target-libgnatvsn"
--lang_dirs="libada libgnatvsn gnattools"
-+target_libs="target-libada target-libgnatvsn target-libgnatprj"
-+lang_dirs="libada libgnatvsn libgnatprj gnattools"
- 
- # Ada will not work until the front end starts emitting GIMPLE trees.
- build_by_default=no
-Index: gnattools/Makefile.in
-===================================================================
---- gnattools/Makefile.in.orig
-+++ gnattools/Makefile.in
-@@ -35,13 +35,13 @@
- target_noncanonical=@target_noncanonical@
- 
- CFLAGS=-O2 -Wall
--INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
- ADA_CFLAGS=-O2 -gnatn
--ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn
-+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn -I../libgnatprj
- LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
-               ../libgnatvsn/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
- ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
- ADA_LIBS += -L../libgnatvsn -lgnatvsn
-+ADA_LIBS += -L../libgnatprj -lgnatprj
- 
- # We will use the just-built compiler to compile and link everything.
- GCC=../gcc/xgcc -B../gcc/
-@@ -66,74 +66,18 @@
- 
- # Since we don't have gnatmake, we must specify the full list of
- # object files necessary to build gnatmake and gnatlink.
--# TODO: remove from these lists the objects that are part of
--# libgnatprj.
- GNATLINK_OBJS = \
--ali.o \
--butil.o \
--fmap.o \
- gnatlink.o \
- indepsw.o \
--osint.o \
--prefix.o \
--rident.o \
--sdefault.o \
--stylesw.o \
--switch.o \
--targparm.o \
- validsw.o
- 
- GNATMAKE_OBJS = \
--ali-util.o \
--ali.o \
--binderr.o \
--butil.o \
--err_vars.o \
--erroutc.o \
--errutil.o \
--fmap.o \
- fname-sf.o \
--fname-uf.o \
- gnatmake.o \
- make.o \
- makeusg.o \
--makeutl.o \
--mlib-fil.o \
- mlib-prj.o \
--mlib-tgt.o \
--mlib-tgt-specific.o \
--mlib-utl.o \
--mlib.o \
- osint-m.o \
--osint.o \
--prefix.o \
--prj-attr-pm.o \
--prj-attr.o \
--prj-com.o \
--prj-dect.o \
--prj-env.o \
--prj-err.o \
--prj-ext.o \
--prj-nmsc.o \
--prj-pars.o \
--prj-part.o \
--prj-proc.o \
--prj-strt.o \
--prj-tree.o \
--prj-util.o \
--prj.o \
--rident.o \
--scng.o \
--sdefault.o \
--sfn_scan.o \
--sinput-c.o \
--sinput-p.o \
--styleg.o \
--stylesw.o \
--switch-m.o \
--switch.o \
--targparm.o \
--tempdir.o \
- usage.o \
- validsw.o \
- $(EXTRA_GNATMAKE_OBJS)
-@@ -175,11 +119,6 @@
- 	for file in $(BODIES) $(SPECS); do \
- 	   $(LN_S) -f $$file .; \
- 	done
--	rm -f sdefault.adb; $(LN_S) ../gcc/ada/sdefault.adb .
--	$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
--	          rm -f $(word 1,$(subst <, ,$(PAIR)));\
--	          $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
--	                  $(word 1,$(subst <, ,$(PAIR)));)
- 	touch $@
- 
- gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
-@@ -192,19 +131,16 @@
- vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc
- vpath %.h @srcdir@/../gcc/ada
- 
--# Because the just-built gcc is a host tool like us, we can use some
--# of its object files, e.g. prefix.o.
--vpath prefix.o ../gcc
--
- # gnatlink
- 
--gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
-+gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o
- 	$(GCC) -o $@ $^ \
-+	   ../libgnatprj/libgnatprj.a \
- 	   ../libgnatvsn/libgnatvsn.a \
- 	   ../gcc/ada/rts/libgnat.a \
- 	   ../libiberty/libiberty.a
- 
--gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o
-+gnatlink: $(GNATLINK_OBJS) b_gnatl.o
- 	$(GCC) -o $@ $^ $(ADA_LIBS) ../libiberty/libiberty.a
- 
- b_gnatl.o: b_gnatl.c adaint.h
-@@ -215,13 +151,14 @@
- 
- # gnatmake
- 
--gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
-+gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o
- 	$(GCC) -o $@ $(ADA_CFLAGS) $^ \
-+	   ../libgnatprj/libgnatprj.a \
- 	   ../libgnatvsn/libgnatvsn.a \
- 	   ../gcc/ada/rts/libgnat.a \
- 	   ../libiberty/libiberty.a
- 
--gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o
-+gnatmake: $(GNATMAKE_OBJS) b_gnatm.o
- 	$(GCC) -o $@ $(ADA_CFLAGS) $^ $(ADA_LIBS) ../libiberty/libiberty.a
- 
- b_gnatm.o: b_gnatm.c adaint.h
-@@ -231,19 +168,11 @@
- 	../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali
- 
- # Other tools
--gnatkr:
--	if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi
--	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
--	   --GCC="$(GCC)" \
--	   --GNATBIND=../gcc/gnatbind
--	./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \
--	   --GCC="$(GCC) $(ADA_INCLUDES)" 
--
- gnat: gnatcmd
- 	cp -lp $< $@
- 
--gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \
--link.o prefix.o
-+gnatbind gnatchop gnatclean gnatcmd gnatfind gnatkr gnatls gnatname gnatprep \
-+gnatxref gprmake:
- 	if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi
- 	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
- 	   --GCC="$(GCC)" \
-@@ -252,29 +181,19 @@
- 	   ../libiberty/libiberty.a \
- 	   --GCC="$(GCC) $(ADA_INCLUDES)"
- 
--gnatbl: gnatbl.c link.o prefix.o
-+gnatbl: gnatbl.c
- 	$(GCC) -o $@ $< $(CFLAGS) \
- 	   -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \
- 	   -I@srcdir@/../include \
- 	   $(filter-out %.c,$^) \
- 	   $(ADA_LIBS) ../libiberty/libiberty.a
- 
--# Force compiling sdefault.adb, not .ads, to produce sdefault.o
--sdefault.o: sdefault.adb
--
--sdefault.adb: stamp-gnattools-sources
--
- %.o: %.adb
- 	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
- 
- %.o: %.ads
- 	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
- 
--%.o: %.c
--	$(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
--
--prefix.o:
--
- # Other
- # -----
- 
-Index: libgnatprj/configure
-===================================================================
---- /dev/null
-+++ libgnatprj/configure
-@@ -0,0 +1,3138 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.61.
-+#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  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
-+
-+
-+
-+
-+# 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
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+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.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+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
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  case $as_dir in
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      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
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+  break
-+fi
-+
-+fi
-+
-+      done
-+
-+      if test "x$CONFIG_SHELL" != x; then
-+  for as_var in BASH_ENV ENV
-+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+        done
-+        export CONFIG_SHELL
-+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+    if test $as_have_required = no; then
-+  echo This script requires a shell more modern than all the
-+      echo shells that I found on your system.  Please install a
-+      echo modern shell, or manually run the script under such a
-+      echo shell if you do have one.
-+      { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf@gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-+    sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-+      N
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
-+      s/-\n.*//
-+    ' >$as_me.lineno &&
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+    as_ln_s='cp -p'
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+
-+exec 7<&0 </dev/null 6>&1
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIBOBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="Makefile.in"
-+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
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+target_noncanonical
-+LN_S
-+x_ada_cflags
-+default_gnattools_target
-+TOOLS_TARGET_PAIRS
-+LIBOBJS
-+LTLIBOBJS'
-+ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+   { (exit 1); exit 1; }; }
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+   { (exit 1); exit 1; }; }
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=\$ac_optarg ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+   { (exit 1); exit 1; }; }
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=\$ac_optarg ;;
-+
-+  -without-* | --without-*)
-+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+   { (exit 1); exit 1; }; }
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=no ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries=$ac_optarg ;;
-+
-+  -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; }
-+    ;;
-+
-+  *=*)
-+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+   { (exit 1); exit 1; }; }
-+    eval $ac_envvar=\$ac_optarg
-+    export $ac_envvar ;;
-+
-+  *)
-+    # FIXME: should be removed in autoconf 3.0.
-+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  { echo "$as_me: error: missing argument to $ac_option" >&2
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  case $ac_val in
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+  esac
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+   { (exit 1); exit 1; }; }
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$0" ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$0" : 'X\(//\)[^/]' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$0" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+   { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+   { (exit 1); exit 1; }; }
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+			  [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+			  [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+  --bindir=DIR           user executables [EPREFIX/bin]
-+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR       program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR           object code libraries [EPREFIX/lib]
-+  --includedir=DIR       C header files [PREFIX/include]
-+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR          info documentation [DATAROOTDIR/info]
-+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR           man documentation [DATAROOTDIR/man]
-+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+  --target=TARGET   configure for building compilers for TARGET [HOST]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+  cat <<\_ACEOF
-+
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d "$ac_dir" || continue
-+    ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.61
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+fi
-+cat >config.log <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.61.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  echo "PATH: $as_dir"
-+done
-+IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    2)
-+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      ac_configure_args="$ac_configure_args '$ac_arg'"
-+      ;;
-+    esac
-+  done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log.  We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+    exit $exit_status
-+' 0
-+for ac_signal in 1 2 13 15; do
-+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -f -r conftest* confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
-+fi
-+shift
-+for ac_site_file
-+do
-+  if test -r "$ac_site_file"; then
-+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special
-+  # files actually), so we avoid doing that.
-+  if test -f "$cache_file"; then
-+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+    case $cache_file in
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-+    esac
-+  fi
-+else
-+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+  >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  case $ac_old_set,$ac_new_set in
-+    set,)
-+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,set)
-+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,);;
-+    *)
-+      if test "x$ac_old_val" != "x$ac_new_val"; then
-+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-+echo "$as_me:   former value:  $ac_old_val" >&2;}
-+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-+echo "$as_me:   current value: $ac_new_val" >&2;}
-+	ac_cache_corrupted=:
-+      fi;;
-+  esac
-+  # Pass precious variables to config.status.
-+  if test "$ac_new_set" = set; then
-+    case $ac_new_val in
-+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+    esac
-+  fi
-+done
-+if $ac_cache_corrupted; then
-+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+
-+# Start of actual configure tests
-+
-+ac_aux_dir=
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+  if test -f "$ac_dir/install-sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f "$ac_dir/install.sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  elif test -f "$ac_dir/shtool"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/shtool install -c"
-+    break
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
-+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
-+# ./install, which can be erroneously created by make from ./install.sh.
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+  ./ | .// | /cC/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+if test "${ac_cv_build+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+   { (exit 1); exit 1; }; }
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+if test "${ac_cv_host+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-+if test "${ac_cv_target+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "x$target_alias" = x; then
-+  ac_cv_target=$ac_cv_host
-+else
-+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
-+target=$ac_cv_target
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-+
-+
-+# The aliases save the names the user supplied, while $host etc.
-+# will get canonicalized.
-+test -n "$target_alias" &&
-+  test "$program_prefix$program_suffix$program_transform_name" = \
-+    NONENONEs,x,x, &&
-+  program_prefix=${target_alias}-
-+
-+# Autoconf M4 include file defining utility macros for complex Canadian
-+# cross builds.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+####
-+# _NCN_TOOL_PREFIXES:  Some stuff that oughtta be done in AC_CANONICAL_SYSTEM
-+# or AC_INIT.
-+# These demand that AC_CANONICAL_SYSTEM be called beforehand.
-+
-+####
-+# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
-+# Like plain AC_CHECK_TOOLS, but require prefix if build!=host.
-+
-+
-+####
-+# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
-+# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
-+
-+
-+
-+# Backported from Autoconf 2.5x; can go away when and if
-+# we switch.  Put the OS path separator in $PATH_SEPARATOR.
-+
-+
-+
-+
-+# ACX_HAVE_GCC_FOR_TARGET
-+# Check if the variable GCC_FOR_TARGET really points to a GCC binary.
-+
-+
-+# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG)
-+# Searching for installed target binutils.  We need to take extra care,
-+# else we may find the wrong assembler, linker, etc., and lose.
-+#
-+# First try --with-build-time-tools, if specified.
-+#
-+# For build != host, we ask the installed GCC for the name of the tool it
-+# uses, and accept it if it is an absolute path.  This is because the
-+# only good choice for a compiler is the same GCC version that is being
-+# installed (or we couldn't make target libraries), and we assume that
-+# on the host system we'll have not only the same GCC version, but also
-+# the same binutils version.
-+#
-+# For build == host, search the same directories that the installed
-+# compiler will search.  We used to do this for the assembler, linker,
-+# and nm only; for simplicity of configuration, however, we extend this
-+# criterion to tools (such as ar and ranlib) that are never invoked by
-+# the compiler, to avoid mismatches.
-+#
-+# Also note we have to check MD_EXEC_PREFIX before checking the user's path
-+# if build == target.  This makes the most sense only when bootstrapping,
-+# but we also do so when build != host.  In this case, we hope that the
-+# build and host systems will have similar contents of MD_EXEC_PREFIX.
-+#
-+# If we do not find a suitable binary, then try the user's path.
-+
-+
-+###
-+# AC_PROG_CPP_WERROR
-+# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which
-+# triggers warnings from the preprocessor.  Will be in autoconf 2.58.
-+# For now, using this also overrides header checks to use only the
-+# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a
-+# bit harder from here).
-+# Eventually autoconf will default to checking headers with the compiler
-+# instead, and we'll have to do this differently.
-+
-+# AC_PROG_CPP_WERROR
-+
-+# Test for GNAT.
-+# We require the gnatbind program, and a compiler driver that
-+# understands Ada.  We use the user's CC setting, already found.
-+#
-+# Sets the shell variable have_gnat to yes or no as appropriate, and
-+# substitutes GNATBIND and GNATMAKE.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ case ${build_alias} in
-+  "") build_noncanonical=${build} ;;
-+  *) build_noncanonical=${build_alias} ;;
-+esac
-+
-+ case ${host_alias} in
-+  "") host_noncanonical=${build_noncanonical} ;;
-+  *) host_noncanonical=${host_alias} ;;
-+esac
-+
-+ case ${target_alias} in
-+  "") target_noncanonical=${host_noncanonical} ;;
-+  *) target_noncanonical=${target_alias} ;;
-+esac
-+
-+
-+
-+
-+# Need to pass this down for now :-P
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
-+fi
-+
-+
-+# Determine x_ada_cflags
-+case $host in
-+  hppa*) x_ada_cflags=-mdisable-indexing ;;
-+  *) x_ada_cflags= ;;
-+esac
-+
-+
-+# Determine what to build for 'gnattools'
-+if test $build = $target ; then
-+  # Note that build=target is almost certainly the wrong test; FIXME
-+  default_gnattools_target="gnattools-native"
-+else
-+  default_gnattools_target="gnattools-cross"
-+fi
-+
-+
-+# Target-specific stuff (defaults)
-+TOOLS_TARGET_PAIRS=
-+
-+
-+# Per-target case statement
-+# -------------------------
-+case "${target}" in
-+  alpha*-dec-vx*) # Unlike all other Vxworks
-+    ;;
-+  m68k*-wrs-vx* \
-+  | powerpc*-wrs-vxworks \
-+  | sparc*-wrs-vx* \
-+  | *86-wrs-vxworks \
-+  | xscale*-wrs-vx* \
-+  | xscale*-wrs-coff \
-+  | mips*-wrs-vx*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-vxworks.adb"
-+    ;;
-+  sparc-sun-solaris*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb"
-+    ;;
-+  *86-*-solaris2*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb"
-+    ;;
-+  *86-*-linux* \
-+  | powerpc*-*-linux* \
-+  | *ia64-*-linux* \
-+  | alpha*-*-linux* \
-+  | sparc*-*-linux* \
-+  | hppa*-*-linux* \
-+  | *x86_64-*-linux*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-linux.adb \
-+    indepsw.adb<indepsw-gnu.adb"
-+    ;;
-+  s390*-*-linux*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-linux.adb"
-+    ;;
-+  *86-*-freebsd*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-linux.adb \
-+    indepsw.adb<indepsw-gnu.adb"
-+    ;;
-+  mips-sgi-irix*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-irix.adb"
-+    ;;
-+  hppa*-hp-hpux10*) # Unlike hpux11
-+    ;;
-+  hppa*-hp-hpux11*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-hpux.adb"
-+    ;;
-+  *-ibm-aix*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-aix.adb \
-+    indepsw.adb<indepsw-aix.adb"
-+    ;;
-+  alpha*-dec-osf*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-tru64.adb"
-+    ;;
-+  alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \
-+  | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-vms-alpha.adb \
-+    symbols.adb<symbols-vms.adb \
-+    symbols-processing.adb<symbols-processing-vms-alpha.adb"
-+    ;;
-+  ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \
-+  | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-vms-ia64.adb \
-+    symbols.adb<symbols-vms.adb \
-+    symbols-processing.adb<symbols-processing-vms-ia64.adb"
-+    ;;
-+  *-*-cygwin32* | *-*-mingw32* | *-*-pe)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-mingw.adb \
-+    indepsw.adb<indepsw-mingw.adb"
-+    ;;
-+  powerpc-*-darwin*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-darwin.adb"
-+    ;;
-+  *-*-lynxos)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-lynxos.adb \
-+    indepsw.adb<indepsw-gnu.adb"
-+    ;;
-+esac
-+
-+# Output: create a Makefile.
-+ac_config_files="$ac_config_files Makefile"
-+
-+
-+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
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# 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 $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 "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     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 "$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
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+# 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 branch to the quote section.  Otherwise,
-+# look for a macro that doesn't take arguments.
-+ac_script='
-+t clear
-+:clear
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-+t quote
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
-+t quote
-+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_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
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  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
-+
-+
-+
-+
-+# 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
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+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.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-+    sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-+      N
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
-+      s/-\n.*//
-+    ' >$as_me.lineno &&
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+    as_ln_s='cp -p'
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&1
-+
-+# Save the log message, to keep $[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.
-+ac_log="
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.61.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+  -h, --help       print this help, 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
-+  --file=FILE[:TEMPLATE]
-+		   instantiate the configuration file FILE
-+
-+Configuration files:
-+$config_files
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.61,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2006 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value.  By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --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;;
-+  --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: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; } ;;
-+
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+  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
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
-+  *) { { 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
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# 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 ||
-+{
-+  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 "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in ." >&2
-+   { (exit 1); exit 1; }
-+}
-+
-+#
-+# 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
-+
-+_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
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$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
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+target_noncanonical!$target_noncanonical$ac_delim
-+LN_S!$LN_S$ac_delim
-+x_ada_cflags!$x_ada_cflags$ac_delim
-+default_gnattools_target!$default_gnattools_target$ac_delim
-+TOOLS_TARGET_PAIRS!$TOOLS_TARGET_PAIRS$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` = 59; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-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
-+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
-+
-+    # 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 ||
-+echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  { as_dir="$ac_dir"
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+_ACEOF
-+
-+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&@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
-+s&@INSTALL@&$ac_INSTALL&;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;}
-+
-+  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
-+
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>config.log
-+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+  # would make configure fail if this is the last instruction.
-+  $ac_cs_success || { (exit 1); exit 1; }
-+fi
-+
-Index: libgnatprj/Makefile.in
-===================================================================
---- /dev/null
-+++ libgnatprj/Makefile.in
-@@ -0,0 +1,177 @@
-+# Makefile for libgnatprj.
-+#   Copyright (c) 2006 Ludovic Brenta <ludovic@ludovic-brenta.org>
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+# Default target; must be first.
-+all: libgnatprj
-+
-+.SUFFIXES:
-+
-+CPUS := $(shell getconf _NPROCESSORS_ONLN)
-+LIB_VERSION := $(strip $(shell grep ' Library_Version :' \
-+                 @srcdir@/../gcc/ada/gnatvsn.ads | \
-+	         sed -e 's/.*"\(.*\)".*/\1/'))
-+GCC:=../gcc/xgcc -B../gcc/
-+LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts
-+LIBGNATVSN := -I../libgnatvsn
-+CFLAGS := -g -O2
-+ADAFLAGS := -g -O2 -gnatn
-+BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER)
-+DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
-+DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
-+TOOLS_TARGET_PAIRS := @TOOLS_TARGET_PAIRS@
-+LN_S := @LN_S@
-+
-+ifneq (@build@,@host@)
-+   CFLAGS += -b @host@
-+endif
-+
-+.PHONY: libgnatprj install
-+libgnatprj: libgnatprj.so.$(LIB_VERSION) libgnatprj.a
-+
-+# Here we list one file per Ada unit: the body file if the unit has a
-+# body, the spec file otherwise.
-+PRJ_SOURCES := ali.adb ali-util.adb butil.adb binderr.adb errout.adb \
-+erroutc.adb errutil.adb err_vars.ads fname-uf.adb fmap.adb impunit.adb \
-+lib-util.adb makeutl.adb mlib.adb mlib-fil.adb mlib-tgt.adb \
-+mlib-tgt-specific.adb mlib-utl.adb osint.adb osint-c.adb prj.adb prj-attr.adb \
-+prj-attr-pm.adb prj-com.ads prj-dect.adb prj-env.adb prj-err.adb prj-ext.adb \
-+prj-nmsc.adb prj-pars.adb prj-part.adb prj-pp.adb prj-proc.adb prj-strt.adb \
-+prj-tree.adb prj-util.adb rident.ads scng.adb sfn_scan.adb sinfo-cn.adb \
-+sinput-c.adb sinput-p.adb style.ads styleg.adb styleg-c.adb stylesw.adb \
-+switch.adb switch-m.adb targparm.adb tempdir.adb
-+
-+# Source files generated in build/gcc/ada, not src/gcc/ada.
-+GENERATED_SOURCES := sdefault.adb
-+
-+SOURCES := $(PRJ_SOURCES) $(GENERATED_SOURCES)
-+
-+OBJECTS := $(patsubst %.ads,%.o,$(SOURCES:.adb=.o))
-+
-+# Add some object files compiled from C sources.  prefix.o requires
-+# some objects from libiberty.
-+OBJECTS += concat.o link.o prefix.o xexit.o xmalloc.o xstrdup.o
-+
-+vpath %.c @srcdir@/../gcc/ada
-+
-+libgnatprj.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
-+	: # Make libgnatprj.so
-+	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \
-+	   -L../gcc/ada/rts -lgnat-$(LIB_VERSION) \
-+	   -L../libgnatvsn -lgnatvsn
-+	$(LN_S) -f libgnatprj.so.$(LIB_VERSION) libgnatprj.so
-+	chmod a=r obj-shared/*.ali
-+# Make the .ali files, but not the .o files, visible to the gnat tools.
-+	cp -lp obj-shared/*.ali .
-+
-+$(addprefix obj-shared/,$(OBJECTS)): | stamp-libgnatprj-sources obj-shared
-+
-+obj-shared/%.o: %.adb
-+	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@
-+
-+obj-shared/%.o: %.ads
-+	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@
-+
-+obj-shared/%.o: %.c
-+	$(GCC) -c -fPIC $(CFLAGS) -I@srcdir@/../gcc $< -o $@
-+
-+obj-shared/prefix.o: @srcdir@/../gcc/prefix.c
-+	$(GCC) -c -fPIC $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \
-+	   -I@srcdir@/../gcc -I@srcdir@/../include -I../gcc -I../libiberty \
-+	   $< -o $@
-+
-+obj-shared/%.o: @srcdir@/../libiberty/%.c
-+	$(GCC) -c -fPIC $(CFLAGS) \
-+	   -I@srcdir@/../libiberty -I@srcdir@/../include $< -o $@
-+
-+obj-shared:
-+	-mkdir $@
-+
-+libgnatprj.a: $(addprefix obj-static/,$(OBJECTS))
-+	: # Make libgnatprj.a
-+	ar rc $@ $^
-+	ranlib $@
-+
-+$(addprefix obj-static/,$(OBJECTS)): | stamp-libgnatprj-sources obj-static
-+
-+obj-static/%.o: %.adb
-+	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@
-+
-+obj-static/%.o: %.ads
-+	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@
-+
-+obj-static/%.o: %.c
-+	$(GCC) -c $(CFLAGS) -I@srcdir@/../gcc $< -o $@
-+
-+obj-static/prefix.o: @srcdir@/../gcc/prefix.c
-+	$(GCC) -c $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \
-+	   -I@srcdir@/../gcc -I@srcdir@/../include -I../gcc -I../libiberty \
-+	   $< -o $@
-+
-+obj-static/%.o: @srcdir@/../libiberty/%.c
-+	$(GCC) -c -fPIC $(CFLAGS) \
-+	   -I@srcdir@/../libiberty -I@srcdir@/../include $< -o $@
-+
-+obj-static:
-+	-mkdir $@
-+
-+$(SOURCES): stamp-libgnatprj-sources
-+
-+stamp-libgnatprj-sources:
-+	for file in $(PRJ_SOURCES); do \
-+	   ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
-+	   if [ -f @srcdir@/../gcc/ada/$$file -a ! -L $$file ] ; then $(LN_S) @srcdir@/../gcc/ada/$$file .; fi; \
-+	   if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) @srcdir@/../gcc/ada/$$ads .; fi; \
-+	done
-+	for file in $(GENERATED_SOURCES); do \
-+	   ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
-+	   if [ -f ../gcc/ada/$$file -a ! -L $$file ] ; then $(LN_S) ../gcc/ada/$$file .; fi; \
-+	   if [ -f ../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) ../gcc/ada/$$ads .; \
-+	   else \
-+	      if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) @srcdir@/../gcc/ada/$$ads .; fi; \
-+	   fi; \
-+	done
-+	$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
-+	          rm -f $(word 1,$(subst <, ,$(PAIR)));\
-+	          $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
-+	                  $(word 1,$(subst <, ,$(PAIR)));)
-+	touch $@
-+
-+# Generate a list of source files (.ads and .adb) to install.  Almost
-+# all of them are in src/gcc/ada, but some are generated during build
-+# and are in build/gcc/ada.
-+BODIES := $(filter %.adb,$(PRJ_SOURCES))
-+SPECS := $(filter %.ads,$(PRJ_SOURCES)) $(patsubst %.adb,%.ads,$(BODIES))
-+SOURCES_TO_INSTALL := \
-+$(addprefix  @srcdir@/../gcc/ada/,$(SPECS) $(BODIES)) \
-+$(addprefix ../gcc/ada/,$(GENERATED_SOURCES))
-+
-+install: libgnatprj
-+	$(INSTALL_DATA) libgnatprj.a $(DESTDIR)$(prefix)/lib
-+	$(INSTALL_DATA) libgnatprj.so.$(LIB_VERSION) $(DESTDIR)$(prefix)/lib
-+	cd $(DESTDIR)$(prefix)/lib; \
-+	ln -sf libgnatprj.so.$(LIB_VERSION) libgnatprj.so
-+	mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj
-+	$(INSTALL_DATA) $(SOURCES_TO_INSTALL) \
-+	   $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj
-+	mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj
-+	$(INSTALL) -m 0444 obj-shared/*.ali \
-+	   $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj
-+	chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj/*.ali
-+
-+.PHONY: clean
-+clean:
-+	rm -rf *.ali obj-static obj-shared libgnatprj* *.adb *.ads stamp*
-Index: Makefile.def
-===================================================================
---- Makefile.def.orig
-+++ Makefile.def
-@@ -130,6 +130,13 @@
- 		missing= TAGS;
- 		missing= install-info;
- 		missing= installcheck; };
-+host_modules= { module= libgnatprj; no_check=true;
-+		missing= info;
-+		missing= dvi;
-+		missing= html;
-+		missing= TAGS;
-+		missing= install-info;
-+		missing= installcheck; };
- host_modules= { module= gnattools; no_check=true;
- 		missing= info;
- 		missing= dvi;
-@@ -175,6 +182,13 @@
- 		   missing= TAGS;
- 		   missing= install-info;
- 		   missing= installcheck; };
-+target_modules = { module= libgnatprj; no_check=true;
-+		   missing= info;
-+		   missing= dvi;
-+		   missing= html;
-+		   missing= TAGS;
-+		   missing= install-info;
-+		   missing= installcheck; };
- target_modules = { module= libgomp; lib_path=.libs; };
- 
- // These are (some of) the make targets to be done in each subdirectory.
-@@ -346,7 +360,10 @@
- 
- dependencies = { module=all-gnattools; on=all-libada; };
- dependencies = { module=all-gnattools; on=all-libgnatvsn; };
-+dependencies = { module=all-gnattools; on=all-libgnatprj; };
- dependencies = { module=all-libgnatvsn; on=all-libada; };
-+dependencies = { module=all-libgnatprj; on=all-libada; };
-+dependencies = { module=all-libgnatprj; on=all-libgnatvsn; };
- 
- dependencies = { module=configure-mpfr; on=all-gmp; };
- 
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig
-+++ Makefile.in
-@@ -699,6 +699,7 @@
-     maybe-configure-utils \
-     maybe-configure-libada \
-     maybe-configure-libgnatvsn \
-+    maybe-configure-libgnatprj \
-     maybe-configure-gnattools
- .PHONY: configure-target
- configure-target:  \
-@@ -723,6 +724,7 @@
-     maybe-configure-target-rda \
-     maybe-configure-target-libada \
-     maybe-configure-target-libgnatvsn \
-+    maybe-configure-target-libgnatprj \
-     maybe-configure-target-libgomp
- 
- # The target built for a native non-bootstrap build.
-@@ -852,6 +854,7 @@
- all-host: maybe-all-utils
- all-host: maybe-all-libada
- all-host: maybe-all-libgnatvsn
-+all-host: maybe-all-libgnatprj
- all-host: maybe-all-gnattools
- 
- .PHONY: all-target
-@@ -879,6 +882,7 @@
- all-target: maybe-all-target-rda
- all-target: maybe-all-target-libada
- all-target: maybe-all-target-libgnatvsn
-+all-target: maybe-all-target-libgnatprj
- all-target: maybe-all-target-libgomp
- 
- # Do a target for all the subdirectories.  A ``make do-X'' will do a
-@@ -968,6 +972,7 @@
- info-host: maybe-info-utils
- info-host: maybe-info-libada
- info-host: maybe-info-libgnatvsn
-+info-host: maybe-info-libgnatprj
- info-host: maybe-info-gnattools
- 
- .PHONY: info-target
-@@ -993,6 +998,7 @@
- info-target: maybe-info-target-rda
- info-target: maybe-info-target-libada
- info-target: maybe-info-target-libgnatvsn
-+info-target: maybe-info-target-libgnatprj
- info-target: maybe-info-target-libgomp
- 
- .PHONY: do-dvi
-@@ -1077,6 +1083,7 @@
- dvi-host: maybe-dvi-utils
- dvi-host: maybe-dvi-libada
- dvi-host: maybe-dvi-libgnatvsn
-+dvi-host: maybe-dvi-libgnatprj
- dvi-host: maybe-dvi-gnattools
- 
- .PHONY: dvi-target
-@@ -1102,6 +1109,7 @@
- dvi-target: maybe-dvi-target-rda
- dvi-target: maybe-dvi-target-libada
- dvi-target: maybe-dvi-target-libgnatvsn
-+dvi-target: maybe-dvi-target-libgnatprj
- dvi-target: maybe-dvi-target-libgomp
- 
- .PHONY: do-pdf
-@@ -1186,6 +1194,7 @@
- pdf-host: maybe-pdf-utils
- pdf-host: maybe-pdf-libada
- pdf-host: maybe-pdf-libgnatvsn
-+pdf-host: maybe-pdf-libgnatprj
- pdf-host: maybe-pdf-gnattools
- 
- .PHONY: pdf-target
-@@ -1211,6 +1220,7 @@
- pdf-target: maybe-pdf-target-rda
- pdf-target: maybe-pdf-target-libada
- pdf-target: maybe-pdf-target-libgnatvsn
-+pdf-target: maybe-pdf-target-libgnatprj
- pdf-target: maybe-pdf-target-libgomp
- 
- .PHONY: do-html
-@@ -1295,6 +1305,7 @@
- html-host: maybe-html-utils
- html-host: maybe-html-libada
- html-host: maybe-html-libgnatvsn
-+html-host: maybe-html-libgnatprj
- html-host: maybe-html-gnattools
- 
- .PHONY: html-target
-@@ -1320,6 +1331,7 @@
- html-target: maybe-html-target-rda
- html-target: maybe-html-target-libada
- html-target: maybe-html-target-libgnatvsn
-+html-target: maybe-html-target-libgnatprj
- html-target: maybe-html-target-libgomp
- 
- .PHONY: do-TAGS
-@@ -1404,6 +1416,7 @@
- TAGS-host: maybe-TAGS-utils
- TAGS-host: maybe-TAGS-libada
- TAGS-host: maybe-TAGS-libgnatvsn
-+TAGS-host: maybe-TAGS-libgnatprj
- TAGS-host: maybe-TAGS-gnattools
- 
- .PHONY: TAGS-target
-@@ -1429,6 +1442,7 @@
- TAGS-target: maybe-TAGS-target-rda
- TAGS-target: maybe-TAGS-target-libada
- TAGS-target: maybe-TAGS-target-libgnatvsn
-+TAGS-target: maybe-TAGS-target-libgnatprj
- TAGS-target: maybe-TAGS-target-libgomp
- 
- .PHONY: do-install-info
-@@ -1513,6 +1527,7 @@
- install-info-host: maybe-install-info-utils
- install-info-host: maybe-install-info-libada
- install-info-host: maybe-install-info-libgnatvsn
-+install-info-host: maybe-install-info-libgnatprj
- install-info-host: maybe-install-info-gnattools
- 
- .PHONY: install-info-target
-@@ -1538,6 +1553,7 @@
- install-info-target: maybe-install-info-target-rda
- install-info-target: maybe-install-info-target-libada
- install-info-target: maybe-install-info-target-libgnatvsn
-+install-info-target: maybe-install-info-target-libgnatprj
- install-info-target: maybe-install-info-target-libgomp
- 
- .PHONY: do-install-pdf
-@@ -1622,6 +1638,7 @@
- install-pdf-host: maybe-install-pdf-utils
- install-pdf-host: maybe-install-pdf-libada
- install-pdf-host: maybe-install-pdf-libgnatvsn
-+install-pdf-host: maybe-install-pdf-libgnatprj
- install-pdf-host: maybe-install-pdf-gnattools
- 
- .PHONY: install-pdf-target
-@@ -1647,6 +1664,7 @@
- install-pdf-target: maybe-install-pdf-target-rda
- install-pdf-target: maybe-install-pdf-target-libada
- install-pdf-target: maybe-install-pdf-target-libgnatvsn
-+install-pdf-target: maybe-install-pdf-target-libgnatprj
- install-pdf-target: maybe-install-pdf-target-libgomp
- 
- .PHONY: do-install-html
-@@ -1731,6 +1749,7 @@
- install-html-host: maybe-install-html-utils
- install-html-host: maybe-install-html-libada
- install-html-host: maybe-install-html-libgnatvsn
-+install-html-host: maybe-install-html-libgnatprj
- install-html-host: maybe-install-html-gnattools
- 
- .PHONY: install-html-target
-@@ -1756,6 +1775,7 @@
- install-html-target: maybe-install-html-target-rda
- install-html-target: maybe-install-html-target-libada
- install-html-target: maybe-install-html-target-libgnatvsn
-+install-html-target: maybe-install-html-target-libgnatprj
- install-html-target: maybe-install-html-target-libgomp
- 
- .PHONY: do-installcheck
-@@ -1840,6 +1860,7 @@
- installcheck-host: maybe-installcheck-utils
- installcheck-host: maybe-installcheck-libada
- installcheck-host: maybe-installcheck-libgnatvsn
-+installcheck-host: maybe-installcheck-libgnatprj
- installcheck-host: maybe-installcheck-gnattools
- 
- .PHONY: installcheck-target
-@@ -1865,6 +1886,7 @@
- installcheck-target: maybe-installcheck-target-rda
- installcheck-target: maybe-installcheck-target-libada
- installcheck-target: maybe-installcheck-target-libgnatvsn
-+installcheck-target: maybe-installcheck-target-libgnatprj
- installcheck-target: maybe-installcheck-target-libgomp
- 
- .PHONY: do-mostlyclean
-@@ -1949,6 +1971,7 @@
- mostlyclean-host: maybe-mostlyclean-utils
- mostlyclean-host: maybe-mostlyclean-libada
- mostlyclean-host: maybe-mostlyclean-libgnatvsn
-+mostlyclean-host: maybe-mostlyclean-libgnatprj
- mostlyclean-host: maybe-mostlyclean-gnattools
- 
- .PHONY: mostlyclean-target
-@@ -1974,6 +1997,7 @@
- mostlyclean-target: maybe-mostlyclean-target-rda
- mostlyclean-target: maybe-mostlyclean-target-libada
- mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
-+mostlyclean-target: maybe-mostlyclean-target-libgnatprj
- mostlyclean-target: maybe-mostlyclean-target-libgomp
- 
- .PHONY: do-clean
-@@ -2058,6 +2082,7 @@
- clean-host: maybe-clean-utils
- clean-host: maybe-clean-libada
- clean-host: maybe-clean-libgnatvsn
-+clean-host: maybe-clean-libgnatprj
- clean-host: maybe-clean-gnattools
- 
- .PHONY: clean-target
-@@ -2083,6 +2108,7 @@
- clean-target: maybe-clean-target-rda
- clean-target: maybe-clean-target-libada
- clean-target: maybe-clean-target-libgnatvsn
-+clean-target: maybe-clean-target-libgnatprj
- clean-target: maybe-clean-target-libgomp
- 
- .PHONY: do-distclean
-@@ -2167,6 +2193,7 @@
- distclean-host: maybe-distclean-utils
- distclean-host: maybe-distclean-libada
- distclean-host: maybe-distclean-libgnatvsn
-+distclean-host: maybe-distclean-libgnatprj
- distclean-host: maybe-distclean-gnattools
- 
- .PHONY: distclean-target
-@@ -2192,6 +2219,7 @@
- distclean-target: maybe-distclean-target-rda
- distclean-target: maybe-distclean-target-libada
- distclean-target: maybe-distclean-target-libgnatvsn
-+distclean-target: maybe-distclean-target-libgnatprj
- distclean-target: maybe-distclean-target-libgomp
- 
- .PHONY: do-maintainer-clean
-@@ -2276,6 +2304,7 @@
- maintainer-clean-host: maybe-maintainer-clean-utils
- maintainer-clean-host: maybe-maintainer-clean-libada
- maintainer-clean-host: maybe-maintainer-clean-libgnatvsn
-+maintainer-clean-host: maybe-maintainer-clean-libgnatprj
- maintainer-clean-host: maybe-maintainer-clean-gnattools
- 
- .PHONY: maintainer-clean-target
-@@ -2301,6 +2330,7 @@
- maintainer-clean-target: maybe-maintainer-clean-target-rda
- maintainer-clean-target: maybe-maintainer-clean-target-libada
- maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
-+maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj
- maintainer-clean-target: maybe-maintainer-clean-target-libgomp
- 
- 
-@@ -2439,6 +2469,7 @@
-     maybe-check-utils \
-     maybe-check-libada \
-     maybe-check-libgnatvsn \
-+    maybe-check-libgnatprj \
-     maybe-check-gnattools
- 
- .PHONY: check-target
-@@ -2464,6 +2495,7 @@
-     maybe-check-target-rda \
-     maybe-check-target-libada \
-     maybe-check-target-libgnatvsn \
-+    maybe-check-target-libgnatprj \
-     maybe-check-target-libgomp
- 
- do-check:
-@@ -2574,6 +2606,7 @@
-     maybe-install-utils \
-     maybe-install-libada \
-     maybe-install-libgnatvsn \
-+    maybe-install-libgnatprj \
-     maybe-install-gnattools
- 
- .PHONY: install-host
-@@ -2649,6 +2682,7 @@
-     maybe-install-utils \
-     maybe-install-libada \
-     maybe-install-libgnatvsn \
-+    maybe-install-libgnatprj \
-     maybe-install-gnattools
- 
- .PHONY: install-target
-@@ -2674,6 +2708,7 @@
-     maybe-install-target-rda \
-     maybe-install-target-libada \
-     maybe-install-target-libgnatvsn \
-+    maybe-install-target-libgnatprj \
-     maybe-install-target-libgomp
- 
- uninstall:
-@@ -39562,6 +39597,327 @@
- 
- 
- 
-+.PHONY: configure-libgnatprj maybe-configure-libgnatprj
-+maybe-configure-libgnatprj:
-+@if gcc-bootstrap
-+configure-libgnatprj: stage_current
-+@endif gcc-bootstrap
-+@if libgnatprj
-+maybe-configure-libgnatprj: configure-libgnatprj
-+configure-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	test ! -f $(HOST_SUBDIR)/libgnatprj/Makefile || exit 0; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatprj ; \
-+	$(HOST_EXPORTS) \
-+	echo Configuring in $(HOST_SUBDIR)/libgnatprj; \
-+	cd "$(HOST_SUBDIR)/libgnatprj" || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(HOST_SUBDIR)/libgnatprj/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	srcdiroption="--srcdir=$${topdir}/libgnatprj"; \
-+	libsrcdir="$$s/libgnatprj"; \
-+	$(SHELL) $${libsrcdir}/configure \
-+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-+	  --target=${target_alias} $${srcdiroption}  \
-+	  || exit 1
-+@endif libgnatprj
-+
-+
-+
-+
-+
-+.PHONY: all-libgnatprj maybe-all-libgnatprj
-+maybe-all-libgnatprj:
-+@if gcc-bootstrap
-+all-libgnatprj: stage_current
-+@endif gcc-bootstrap
-+@if libgnatprj
-+TARGET-libgnatprj=all
-+maybe-all-libgnatprj: all-libgnatprj
-+all-libgnatprj: configure-libgnatprj
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgnatprj))
-+@endif libgnatprj
-+
-+
-+
-+
-+.PHONY: check-libgnatprj maybe-check-libgnatprj
-+maybe-check-libgnatprj:
-+@if libgnatprj
-+maybe-check-libgnatprj: check-libgnatprj
-+
-+check-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: install-libgnatprj maybe-install-libgnatprj
-+maybe-install-libgnatprj:
-+@if libgnatprj
-+maybe-install-libgnatprj: install-libgnatprj
-+
-+install-libgnatprj: installdirs
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(FLAGS_TO_PASS)  install)
-+
-+@endif libgnatprj
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-libgnatprj info-libgnatprj
-+maybe-info-libgnatprj:
-+@if libgnatprj
-+maybe-info-libgnatprj: info-libgnatprj
-+
-+# libgnatprj doesn't support info.
-+info-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-dvi-libgnatprj dvi-libgnatprj
-+maybe-dvi-libgnatprj:
-+@if libgnatprj
-+maybe-dvi-libgnatprj: dvi-libgnatprj
-+
-+# libgnatprj doesn't support dvi.
-+dvi-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-pdf-libgnatprj pdf-libgnatprj
-+maybe-pdf-libgnatprj:
-+@if libgnatprj
-+maybe-pdf-libgnatprj: pdf-libgnatprj
-+
-+pdf-libgnatprj: \
-+    configure-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing pdf in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          pdf) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-html-libgnatprj html-libgnatprj
-+maybe-html-libgnatprj:
-+@if libgnatprj
-+maybe-html-libgnatprj: html-libgnatprj
-+
-+# libgnatprj doesn't support html.
-+html-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-TAGS-libgnatprj TAGS-libgnatprj
-+maybe-TAGS-libgnatprj:
-+@if libgnatprj
-+maybe-TAGS-libgnatprj: TAGS-libgnatprj
-+
-+# libgnatprj doesn't support TAGS.
-+TAGS-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-install-info-libgnatprj install-info-libgnatprj
-+maybe-install-info-libgnatprj:
-+@if libgnatprj
-+maybe-install-info-libgnatprj: install-info-libgnatprj
-+
-+# libgnatprj doesn't support install-info.
-+install-info-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-install-pdf-libgnatprj install-pdf-libgnatprj
-+maybe-install-pdf-libgnatprj:
-+@if libgnatprj
-+maybe-install-pdf-libgnatprj: install-pdf-libgnatprj
-+
-+install-pdf-libgnatprj: \
-+    configure-libgnatprj \
-+    pdf-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing install-pdf in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          install-pdf) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-install-html-libgnatprj install-html-libgnatprj
-+maybe-install-html-libgnatprj:
-+@if libgnatprj
-+maybe-install-html-libgnatprj: install-html-libgnatprj
-+
-+install-html-libgnatprj: \
-+    configure-libgnatprj \
-+    html-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing install-html in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          install-html) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-installcheck-libgnatprj installcheck-libgnatprj
-+maybe-installcheck-libgnatprj:
-+@if libgnatprj
-+maybe-installcheck-libgnatprj: installcheck-libgnatprj
-+
-+# libgnatprj doesn't support installcheck.
-+installcheck-libgnatprj:
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-mostlyclean-libgnatprj mostlyclean-libgnatprj
-+maybe-mostlyclean-libgnatprj:
-+@if libgnatprj
-+maybe-mostlyclean-libgnatprj: mostlyclean-libgnatprj
-+
-+mostlyclean-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing mostlyclean in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          mostlyclean) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-clean-libgnatprj clean-libgnatprj
-+maybe-clean-libgnatprj:
-+@if libgnatprj
-+maybe-clean-libgnatprj: clean-libgnatprj
-+
-+clean-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing clean in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          clean) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-distclean-libgnatprj distclean-libgnatprj
-+maybe-distclean-libgnatprj:
-+@if libgnatprj
-+maybe-distclean-libgnatprj: distclean-libgnatprj
-+
-+distclean-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing distclean in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          distclean) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+.PHONY: maybe-maintainer-clean-libgnatprj maintainer-clean-libgnatprj
-+maybe-maintainer-clean-libgnatprj:
-+@if libgnatprj
-+maybe-maintainer-clean-libgnatprj: maintainer-clean-libgnatprj
-+
-+maintainer-clean-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f ./libgnatprj/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(HOST_EXPORTS) \
-+	for flag in $(EXTRA_HOST_FLAGS) ; do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	echo "Doing maintainer-clean in libgnatprj" ; \
-+	(cd $(HOST_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	          maintainer-clean) \
-+	  || exit 1
-+
-+@endif libgnatprj
-+
-+
-+
- .PHONY: configure-gnattools maybe-configure-gnattools
- maybe-configure-gnattools:
- @if gcc-bootstrap
-@@ -49480,6 +49836,345 @@
- 
- 
- 
-+.PHONY: configure-target-libgnatprj maybe-configure-target-libgnatprj
-+maybe-configure-target-libgnatprj:
-+@if gcc-bootstrap
-+configure-target-libgnatprj: stage_current
-+@endif gcc-bootstrap
-+@if target-libgnatprj
-+maybe-configure-target-libgnatprj: configure-target-libgnatprj
-+configure-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	echo "Checking multilib configuration for libgnatprj..."; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatprj/multilib.tmp 2> /dev/null ; \
-+	if test -r $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libgnatprj/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libgnatprj/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libgnatprj/Makefile || exit 0; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo Configuring in $(TARGET_SUBDIR)/libgnatprj; \
-+	cd "$(TARGET_SUBDIR)/libgnatprj" || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libgnatprj/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	srcdiroption="--srcdir=$${topdir}/libgnatprj"; \
-+	libsrcdir="$$s/libgnatprj"; \
-+	rm -f no-such-file || : ; \
-+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} $${srcdiroption}  \
-+	  || exit 1
-+@endif target-libgnatprj
-+
-+
-+
-+
-+
-+.PHONY: all-target-libgnatprj maybe-all-target-libgnatprj
-+maybe-all-target-libgnatprj:
-+@if gcc-bootstrap
-+all-target-libgnatprj: stage_current
-+@endif gcc-bootstrap
-+@if target-libgnatprj
-+TARGET-target-libgnatprj=all
-+maybe-all-target-libgnatprj: all-target-libgnatprj
-+all-target-libgnatprj: configure-target-libgnatprj
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgnatprj))
-+@endif target-libgnatprj
-+
-+
-+
-+
-+
-+.PHONY: check-target-libgnatprj maybe-check-target-libgnatprj
-+maybe-check-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-check-target-libgnatprj: check-target-libgnatprj
-+
-+# Dummy target for uncheckable module.
-+check-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: install-target-libgnatprj maybe-install-target-libgnatprj
-+maybe-install-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-install-target-libgnatprj: install-target-libgnatprj
-+
-+install-target-libgnatprj: installdirs
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-+
-+@endif target-libgnatprj
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-target-libgnatprj info-target-libgnatprj
-+maybe-info-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-info-target-libgnatprj: info-target-libgnatprj
-+
-+# libgnatprj doesn't support info.
-+info-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-dvi-target-libgnatprj dvi-target-libgnatprj
-+maybe-dvi-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-dvi-target-libgnatprj: dvi-target-libgnatprj
-+
-+# libgnatprj doesn't support dvi.
-+dvi-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-pdf-target-libgnatprj pdf-target-libgnatprj
-+maybe-pdf-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-pdf-target-libgnatprj: pdf-target-libgnatprj
-+
-+pdf-target-libgnatprj: \
-+    configure-target-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing pdf in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           pdf) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-html-target-libgnatprj html-target-libgnatprj
-+maybe-html-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-html-target-libgnatprj: html-target-libgnatprj
-+
-+# libgnatprj doesn't support html.
-+html-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-TAGS-target-libgnatprj TAGS-target-libgnatprj
-+maybe-TAGS-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-TAGS-target-libgnatprj: TAGS-target-libgnatprj
-+
-+# libgnatprj doesn't support TAGS.
-+TAGS-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-install-info-target-libgnatprj install-info-target-libgnatprj
-+maybe-install-info-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-install-info-target-libgnatprj: install-info-target-libgnatprj
-+
-+# libgnatprj doesn't support install-info.
-+install-info-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-install-pdf-target-libgnatprj install-pdf-target-libgnatprj
-+maybe-install-pdf-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-install-pdf-target-libgnatprj: install-pdf-target-libgnatprj
-+
-+install-pdf-target-libgnatprj: \
-+    configure-target-libgnatprj \
-+    pdf-target-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-pdf) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-install-html-target-libgnatprj install-html-target-libgnatprj
-+maybe-install-html-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-install-html-target-libgnatprj: install-html-target-libgnatprj
-+
-+install-html-target-libgnatprj: \
-+    configure-target-libgnatprj \
-+    html-target-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-html in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-html) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-installcheck-target-libgnatprj installcheck-target-libgnatprj
-+maybe-installcheck-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-installcheck-target-libgnatprj: installcheck-target-libgnatprj
-+
-+# libgnatprj doesn't support installcheck.
-+installcheck-target-libgnatprj:
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-mostlyclean-target-libgnatprj mostlyclean-target-libgnatprj
-+maybe-mostlyclean-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-mostlyclean-target-libgnatprj: mostlyclean-target-libgnatprj
-+
-+mostlyclean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           mostlyclean) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-clean-target-libgnatprj clean-target-libgnatprj
-+maybe-clean-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-clean-target-libgnatprj: clean-target-libgnatprj
-+
-+clean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing clean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           clean) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-distclean-target-libgnatprj distclean-target-libgnatprj
-+maybe-distclean-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-distclean-target-libgnatprj: distclean-target-libgnatprj
-+
-+distclean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing distclean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           distclean) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+.PHONY: maybe-maintainer-clean-target-libgnatprj maintainer-clean-target-libgnatprj
-+maybe-maintainer-clean-target-libgnatprj:
-+@if target-libgnatprj
-+maybe-maintainer-clean-target-libgnatprj: maintainer-clean-target-libgnatprj
-+
-+maintainer-clean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           maintainer-clean) \
-+	  || exit 1
-+
-+@endif target-libgnatprj
-+
-+
-+
-+
-+
- .PHONY: configure-target-libgomp maybe-configure-target-libgomp
- maybe-configure-target-libgomp:
- @if gcc-bootstrap
-@@ -52030,6 +52725,7 @@
- configure-target-rda: stage_last
- configure-target-libada: stage_last
- configure-target-libgnatvsn: stage_last
-+configure-target-libgnatprj: stage_last
- configure-target-libgomp: stage_last
- @endif gcc-bootstrap
- 
-@@ -52055,6 +52751,7 @@
- configure-target-rda: maybe-all-gcc
- configure-target-libada: maybe-all-gcc
- configure-target-libgnatvsn: maybe-all-gcc
-+configure-target-libgnatprj: maybe-all-gcc
- configure-target-libgomp: maybe-all-gcc
- @endif gcc-no-bootstrap
- 
-@@ -52310,7 +53007,10 @@
- all-fixincludes: maybe-all-libiberty
- all-gnattools: maybe-all-libada
- all-gnattools: maybe-all-libgnatvsn
-+all-gnattools: maybe-all-libgnatprj
- all-libgnatvsn: maybe-all-libada
-+all-libgnatprj: maybe-all-libada
-+all-libgnatprj: maybe-all-libgnatvsn
- configure-mpfr: maybe-all-gmp
- 
- configure-stage1-mpfr: maybe-all-stage1-gmp
-@@ -52749,6 +53449,7 @@
- configure-target-rda: maybe-all-target-libgcc
- configure-target-libada: maybe-all-target-libgcc
- configure-target-libgnatvsn: maybe-all-target-libgcc
-+configure-target-libgnatprj: maybe-all-target-libgcc
- configure-target-libgomp: maybe-all-target-libgcc
- @endif gcc-no-bootstrap
- 
-@@ -52793,6 +53494,8 @@
- 
- configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
- 
-+configure-target-libgnatprj: maybe-all-target-newlib maybe-all-target-libgloss
-+
- configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
- 
- 
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -155,7 +155,7 @@
- 
- # these libraries are used by various programs built for the host environment
- #
--host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada libgnatvsn"
-+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada libgnatvsn libgnatprj"
- 
- # these tools are built for the host environment
- # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
-@@ -186,7 +186,8 @@
- 		${libgcj} \
- 		target-libobjc \
- 		target-libada \
--		target-libgnatvsn"
-+		target-libgnatvsn \
-+		target-libgnatprj"
- 
- # these tools are built using the target libraries, and are intended to
- # run only in the target environment
-@@ -264,7 +265,7 @@
- 
- # Similarly, some are only suitable for cross toolchains.
- # Remove these if host=target.
--cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn"
-+cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn target-libgnatprj"
- 
- case $is_cross_compiler in
-   no) skipdirs="${skipdirs} ${cross_only}" ;;
-@@ -341,7 +342,7 @@
- ENABLE_LIBADA=$enableval,
- ENABLE_LIBADA=yes)
- if test "${ENABLE_LIBADA}" != "yes" ; then
--  noconfigdirs="$noconfigdirs libgnatvsn gnattools"
-+  noconfigdirs="$noconfigdirs libgnatvsn libgnatprj gnattools"
- fi
- 
- AC_ARG_ENABLE(libssp,
-Index: libgnatprj/configure.ac
-===================================================================
---- /dev/null
-+++ libgnatprj/configure.ac
-@@ -0,0 +1,144 @@
-+# Configure script for libada.
-+#   Copyright 2003, 2004 Free Software Foundation, Inc.
-+#
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+AC_INIT
-+AC_PREREQ([2.59])
-+
-+AC_CONFIG_SRCDIR([Makefile.in])
-+
-+# Start of actual configure tests
-+
-+AC_PROG_INSTALL
-+
-+AC_CANONICAL_BUILD
-+AC_CANONICAL_HOST
-+AC_CANONICAL_TARGET
-+
-+sinclude(../config/acx.m4)
-+ACX_NONCANONICAL_TARGET
-+
-+# Need to pass this down for now :-P
-+AC_PROG_LN_S
-+
-+# Determine x_ada_cflags
-+case $host in
-+  hppa*) x_ada_cflags=-mdisable-indexing ;;
-+  *) x_ada_cflags= ;;
-+esac
-+AC_SUBST([x_ada_cflags])
-+
-+# Determine what to build for 'gnattools'
-+if test $build = $target ; then
-+  # Note that build=target is almost certainly the wrong test; FIXME
-+  default_gnattools_target="gnattools-native"
-+else
-+  default_gnattools_target="gnattools-cross"
-+fi
-+AC_SUBST([default_gnattools_target])
-+
-+# Target-specific stuff (defaults)
-+TOOLS_TARGET_PAIRS=
-+AC_SUBST(TOOLS_TARGET_PAIRS)
-+
-+# Per-target case statement
-+# -------------------------
-+case "${target}" in
-+  alpha*-dec-vx*) # Unlike all other Vxworks
-+    ;;
-+  m68k*-wrs-vx* \
-+  | powerpc*-wrs-vxworks \
-+  | sparc*-wrs-vx* \
-+  | *86-wrs-vxworks \
-+  | xscale*-wrs-vx* \
-+  | xscale*-wrs-coff \
-+  | mips*-wrs-vx*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-vxworks.adb"
-+    ;;
-+  sparc-sun-solaris*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb"
-+    ;;
-+  *86-*-solaris2*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb"
-+    ;;
-+  *86-*-linux* \
-+  | powerpc*-*-linux* \
-+  | *ia64-*-linux* \
-+  | alpha*-*-linux* \
-+  | sparc*-*-linux* \
-+  | hppa*-*-linux* \
-+  | *x86_64-*-linux*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-linux.adb \
-+    indepsw.adb<indepsw-gnu.adb"
-+    ;;
-+  s390*-*-linux*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-linux.adb"
-+    ;;
-+  *86-*-freebsd*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-linux.adb \
-+    indepsw.adb<indepsw-gnu.adb"
-+    ;;
-+  mips-sgi-irix*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-irix.adb"
-+    ;;
-+  hppa*-hp-hpux10*) # Unlike hpux11
-+    ;;
-+  hppa*-hp-hpux11*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-hpux.adb"
-+    ;;
-+  *-ibm-aix*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-aix.adb \
-+    indepsw.adb<indepsw-aix.adb"
-+    ;;
-+  alpha*-dec-osf*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-tru64.adb"
-+    ;;
-+  alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \
-+  | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-vms-alpha.adb \
-+    symbols.adb<symbols-vms.adb \
-+    symbols-processing.adb<symbols-processing-vms-alpha.adb"
-+    ;;
-+  ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \
-+  | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-vms-ia64.adb \
-+    symbols.adb<symbols-vms.adb \
-+    symbols-processing.adb<symbols-processing-vms-ia64.adb"
-+    ;;
-+  *-*-cygwin32* | *-*-mingw32* | *-*-pe)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-mingw.adb \
-+    indepsw.adb<indepsw-mingw.adb"
-+    ;;
-+  powerpc-*-darwin*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-darwin.adb"
-+    ;;
-+  *-*-lynxos)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-lynxos.adb \
-+    indepsw.adb<indepsw-gnu.adb"
-+    ;;
-+esac
-+
-+# Output: create a Makefile.
-+AC_CONFIG_FILES([Makefile])
-+
-+AC_OUTPUT