[Patch] #7: libgnatvsn
libgnatvsn is a new library that I pioneered starting in gnat
3.15p-17. This library contains the Ada package gnatvsn, which
contains the GNAT version string, and also a number of other object
files that are normally part of the GNAT compiler. The sources are
all licensed under the GNAT-Modified GPL, allowing even proprietary
programs to use them. (This is in contrast to libgnatprj, for which I
will send the patch in the coming days).
The reason for libgnatvsn is because the source files in it are copied
in the ASIS, GLADE and GPS upstream source packages from AdaCore.
With binary packages for libgnatvsn, we can avoid rebuilding them in
potentially incompatible ways when we build ASIS, GLADE and GPS. The
library is also available for use by any program that requires insight
into the GNAT compiler, or simply wants to query the version of GNAT
for some reason. libgnatvsn by itself is sufficient to build ASIS;
GLADE and GPS, in contrast, also need libgnatprj because they
understand project files.
The patch below introduces ada-libgnatvsn.dpatch, which must always be
applied after ada-link-lib.dpatch. ada-libgnatvsn.dpatch builds the
static and shared versions of the library in a top-level directory
(build/libgnatvsn), and then links the GNAT tools dynamically against
it.
I would appreciate comments on the way I created the new toplevel
directory for libgnatvsn, in particular the minimalistic configure
script.
Other files modified here are rules.d/binary-ada.mk and control.m4,
because we are introducing two new binary packages.
Apply this patch after patch #6.
--
Ludovic Brenta.
Index: control.m4
===================================================================
RCS file: /var/lib/cvs/gcc-debian/F-168174F1103CFBB9DB07DE2D5192A260.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- control.m4 1 Apr 2006 14:11:50 -0000 1.4
+++ control.m4 14 Apr 2006 16:11:43 -0000 1.5
@@ -924,6 +924,29 @@
Depends: BASEDEP, ${shlibs:Depends}
Description: Runtime library for GNU Ada applications
Library needed for GNU Ada applications linked against the shared library.
+
+Package: libgnatvsn-dev
+Section: libdevel
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, libgnatvsn`'-GNAT_V (=${Source-Version})
+Description: GNU Ada compiler version library - development files
+ This library exports selected components of GNAT, the GNU Ada compiler, for use
+ in other packages, most notably ASIS and ASIS-based packages. It is licensed
+ under the GNAT-Modified GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsn`'GNAT_V
+Architecture: any
+Section: libs
+Depends: BASEDEP, libgnat`'-GNAT_V (=${Source-Version})
+Description: GNU Ada compiler version library
+ This library exports selected components of GNAT, the GNU Ada compiler, for use
+ in other packages, most notably ASIS and ASIS-based packages. It is licensed
+ under the GNAT-Modified GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the run-time shared library.
')`'dnl libgnat
ifenabled(`lib64gnat',`
Index: patches/ada-libgnatvsn.dpatch
===================================================================
RCS file: patches/ada-libgnatvsn.dpatch
diff -N patches/ada-libgnatvsn.dpatch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/ada-libgnatvsn.dpatch 13 Apr 2006 21:43:42 -0000 1.4
@@ -0,0 +1,2120 @@
+#! /bin/sh -e
+
+# DP: - Introduce a new shared library named libgnatvsn, containing
+# DP: common components of GNAT under the GNAT-Modified GPL, for
+# DP: use in GNAT tools, ASIS, GLADE and GPS.
+
+# This patch seems large, but the hunks in Makefile.in are actually
+# generated from Makefile.def using autogen. Similarly, the changes
+# in configure.in go into configure by means of autoconf.
+
+# !!! Must be applied after ada-link-lib.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
+ ;;
+ -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
+
+--- configure~
++++ configure 2006-04-13 08:18:04.000000000 +0200
+@@ -881,7 +881,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 libada"
++host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libada libgnatvsn"
+
+ # these tools are built for the host environment
+ # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+@@ -909,7 +909,8 @@
+ target-libgfortran \
+ target-libffi \
+ target-libobjc \
+- target-libada"
++ target-libada \
++ target-libgnatvsn"
+
+ # these tools are built using the target libraries, and are intended to
+ # run only in the target environment
+@@ -1013,7 +1014,7 @@
+
+ # Similarly, some are only suitable for cross toolchains.
+ # Remove these if host=target.
+-cross_only="target-libgloss target-newlib target-opcodes target-libada"
++cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn"
+
+ case $is_cross_compiler in
+ no) skipdirs="${skipdirs} ${cross_only}" ;;
+@@ -1821,7 +1822,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1825: checking for $ac_word" >&5
++echo "configure:1826: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1851,7 +1852,7 @@
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1855: checking for $ac_word" >&5
++echo "configure:1856: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1902,7 +1903,7 @@
+ # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1906: checking for $ac_word" >&5
++echo "configure:1907: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1934,7 +1935,7 @@
+ fi
+
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1945,12 +1946,12 @@
+
+ cat > conftest.$ac_ext << EOF
+
+-#line 1949 "configure"
++#line 1950 "configure"
+ #include "confdefs.h"
+
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+@@ -1976,12 +1977,12 @@
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1981: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1985: checking whether we are using GNU C" >&5
++echo "configure:1986: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1990,7 +1991,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+@@ -2009,7 +2010,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:2013: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2014: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2076,7 +2077,7 @@
+ # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2080: checking for $ac_word" >&5
++echo "configure:2081: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2108,7 +2109,7 @@
+ # Extract the first word of "gnatbind", so it can be a program name with args.
+ set dummy gnatbind; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2112: checking for $ac_word" >&5
++echo "configure:2113: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2141,7 +2142,7 @@
+ fi
+
+ echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
+-echo "configure:2145: checking whether compiler driver understands Ada" >&5
++echo "configure:2146: checking whether compiler driver understands Ada" >&5
+ if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2173,7 +2174,7 @@
+ fi
+
+ echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
+-echo "configure:2177: checking how to compare bootstrapped objects" >&5
++echo "configure:2178: checking how to compare bootstrapped objects" >&5
+ if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2271,9 +2272,9 @@
+ CFLAGS="$CFLAGS $gmpinc"
+ # Check GMP actually works
+ echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
+-echo "configure:2275: checking for correct version of gmp.h" >&5
++echo "configure:2276: checking for correct version of gmp.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2277 "configure"
++#line 2278 "configure"
+ #include "confdefs.h"
+ #include "gmp.h"
+ int main() {
+@@ -2284,7 +2285,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ echo "$ac_t""yes" 1>&6
+ else
+@@ -2297,12 +2298,12 @@
+
+ if test x"$have_gmp" = xyes; then
+ echo $ac_n "checking for MPFR""... $ac_c" 1>&6
+-echo "configure:2301: checking for MPFR" >&5
++echo "configure:2302: checking for MPFR" >&5
+
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $gmplibs"
+ cat > conftest.$ac_ext <<EOF
+-#line 2306 "configure"
++#line 2307 "configure"
+ #include "confdefs.h"
+ #include <gmp.h>
+ #include <mpfr.h>
+@@ -2310,7 +2311,7 @@
+ mpfr_t n; mpfr_init(n);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ echo "$ac_t""yes" 1>&6
+ else
+@@ -3309,7 +3310,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3313: checking for $ac_word" >&5
++echo "configure:3314: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3349,7 +3350,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3353: checking for $ac_word" >&5
++echo "configure:3354: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3388,7 +3389,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3392: checking for $ac_word" >&5
++echo "configure:3393: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3427,7 +3428,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3431: checking for $ac_word" >&5
++echo "configure:3432: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3467,7 +3468,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3471: checking for $ac_word" >&5
++echo "configure:3472: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3506,7 +3507,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3510: checking for $ac_word" >&5
++echo "configure:3511: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3559,7 +3560,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3563: checking for $ac_word" >&5
++echo "configure:3564: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3600,7 +3601,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3604: checking for $ac_word" >&5
++echo "configure:3605: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3648,7 +3649,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3652: checking for $ac_word" >&5
++echo "configure:3653: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3679,7 +3680,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3683: checking for $ac_word" >&5
++echo "configure:3684: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3723,7 +3724,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3727: checking for $ac_word" >&5
++echo "configure:3728: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3754,7 +3755,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3758: checking for $ac_word" >&5
++echo "configure:3759: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3798,7 +3799,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3802: checking for $ac_word" >&5
++echo "configure:3803: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3829,7 +3830,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3833: checking for $ac_word" >&5
++echo "configure:3834: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3873,7 +3874,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3877: checking for $ac_word" >&5
++echo "configure:3878: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3904,7 +3905,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3908: checking for $ac_word" >&5
++echo "configure:3909: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3948,7 +3949,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3952: checking for $ac_word" >&5
++echo "configure:3953: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3979,7 +3980,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3983: checking for $ac_word" >&5
++echo "configure:3984: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4023,7 +4024,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4027: checking for $ac_word" >&5
++echo "configure:4028: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4054,7 +4055,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4058: checking for $ac_word" >&5
++echo "configure:4059: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4098,7 +4099,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4102: checking for $ac_word" >&5
++echo "configure:4103: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4129,7 +4130,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4133: checking for $ac_word" >&5
++echo "configure:4134: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4168,7 +4169,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4172: checking for $ac_word" >&5
++echo "configure:4173: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4199,7 +4200,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4203: checking for $ac_word" >&5
++echo "configure:4204: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4238,7 +4239,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4242: checking for $ac_word" >&5
++echo "configure:4243: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4269,7 +4270,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4273: checking for $ac_word" >&5
++echo "configure:4274: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4313,7 +4314,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4317: checking for $ac_word" >&5
++echo "configure:4318: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4344,7 +4345,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4348: checking for $ac_word" >&5
++echo "configure:4349: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4388,7 +4389,7 @@
+ # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4392: checking for $ac_word" >&5
++echo "configure:4393: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4419,7 +4420,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4423: checking for $ac_word" >&5
++echo "configure:4424: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4470,7 +4471,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4474: checking for $ac_word" >&5
++echo "configure:4475: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4501,7 +4502,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4505: checking for $ac_word" >&5
++echo "configure:4506: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4545,7 +4546,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4549: checking for $ac_word" >&5
++echo "configure:4550: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4576,7 +4577,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4580: checking for $ac_word" >&5
++echo "configure:4581: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4620,7 +4621,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4624: checking for $ac_word" >&5
++echo "configure:4625: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4651,7 +4652,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4655: checking for $ac_word" >&5
++echo "configure:4656: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4695,7 +4696,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4699: checking for $ac_word" >&5
++echo "configure:4700: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4726,7 +4727,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4730: checking for $ac_word" >&5
++echo "configure:4731: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4770,7 +4771,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4774: checking for $ac_word" >&5
++echo "configure:4775: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4801,7 +4802,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4805: checking for $ac_word" >&5
++echo "configure:4806: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4845,7 +4846,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4849: checking for $ac_word" >&5
++echo "configure:4850: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4876,7 +4877,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4880: checking for $ac_word" >&5
++echo "configure:4881: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4915,7 +4916,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4919: checking for $ac_word" >&5
++echo "configure:4920: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4946,7 +4947,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4950: checking for $ac_word" >&5
++echo "configure:4951: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4990,7 +4991,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4994: checking for $ac_word" >&5
++echo "configure:4995: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5021,7 +5022,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5025: checking for $ac_word" >&5
++echo "configure:5026: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5065,7 +5066,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5069: checking for $ac_word" >&5
++echo "configure:5070: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5096,7 +5097,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5100: checking for $ac_word" >&5
++echo "configure:5101: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5140,7 +5141,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5144: checking for $ac_word" >&5
++echo "configure:5145: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5171,7 +5172,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5175: checking for $ac_word" >&5
++echo "configure:5176: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5215,7 +5216,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5219: checking for $ac_word" >&5
++echo "configure:5220: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5246,7 +5247,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5250: checking for $ac_word" >&5
++echo "configure:5251: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5290,7 +5291,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5294: checking for $ac_word" >&5
++echo "configure:5295: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5321,7 +5322,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5325: checking for $ac_word" >&5
++echo "configure:5326: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5365,7 +5366,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5369: checking for $ac_word" >&5
++echo "configure:5370: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5396,7 +5397,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5400: checking for $ac_word" >&5
++echo "configure:5401: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5435,7 +5436,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5439: checking for $ac_word" >&5
++echo "configure:5440: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5466,7 +5467,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5470: checking for $ac_word" >&5
++echo "configure:5471: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5510,7 +5511,7 @@
+ # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5514: checking for $ac_word" >&5
++echo "configure:5515: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5541,7 +5542,7 @@
+ # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+ set dummy ${ncn_progname}; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5545: checking for $ac_word" >&5
++echo "configure:5546: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5584,7 +5585,7 @@
+ RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
+
+ echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6
+-echo "configure:5588: checking where to find the target ar" >&5
++echo "configure:5589: checking where to find the target ar" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5609,7 +5610,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target as""... $ac_c" 1>&6
+-echo "configure:5613: checking where to find the target as" >&5
++echo "configure:5614: checking where to find the target as" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5634,7 +5635,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6
+-echo "configure:5638: checking where to find the target cc" >&5
++echo "configure:5639: checking where to find the target cc" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5659,7 +5660,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6
+-echo "configure:5663: checking where to find the target c++" >&5
++echo "configure:5664: checking where to find the target c++" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5687,7 +5688,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6
+-echo "configure:5691: checking where to find the target c++ for libstdc++" >&5
++echo "configure:5692: checking where to find the target c++ for libstdc++" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5715,7 +5716,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6
+-echo "configure:5719: checking where to find the target dlltool" >&5
++echo "configure:5720: checking where to find the target dlltool" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5740,7 +5741,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6
+-echo "configure:5744: checking where to find the target gcc" >&5
++echo "configure:5745: checking where to find the target gcc" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5765,7 +5766,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6
+-echo "configure:5769: checking where to find the target gcj" >&5
++echo "configure:5770: checking where to find the target gcj" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5793,7 +5794,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
+-echo "configure:5797: checking where to find the target gfortran" >&5
++echo "configure:5798: checking where to find the target gfortran" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5821,7 +5822,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
+-echo "configure:5825: checking where to find the target ld" >&5
++echo "configure:5826: checking where to find the target ld" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5846,7 +5847,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6
+-echo "configure:5850: checking where to find the target lipo" >&5
++echo "configure:5851: checking where to find the target lipo" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5861,7 +5862,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6
+-echo "configure:5865: checking where to find the target nm" >&5
++echo "configure:5866: checking where to find the target nm" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5886,7 +5887,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6
+-echo "configure:5890: checking where to find the target objdump" >&5
++echo "configure:5891: checking where to find the target objdump" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5911,7 +5912,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6
+-echo "configure:5915: checking where to find the target ranlib" >&5
++echo "configure:5916: checking where to find the target ranlib" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5936,7 +5937,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6
+-echo "configure:5940: checking where to find the target strip" >&5
++echo "configure:5941: checking where to find the target strip" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -5961,7 +5962,7 @@
+ fi
+ fi
+ echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6
+-echo "configure:5965: checking where to find the target windres" >&5
++echo "configure:5966: checking where to find the target windres" >&5
+ if test "x${build}" != "x${host}" ; then
+ # Canadian cross, just use what we found
+ echo "$ac_t""pre-installed" 1>&6
+@@ -6014,7 +6015,7 @@
+
+
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+-echo "configure:6018: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo "configure:6019: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+@@ -6061,7 +6062,7 @@
+ # gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
+ # possible, however, we can resort to mv.
+ echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
+-echo "configure:6065: checking if symbolic links between directories work" >&5
++echo "configure:6066: checking if symbolic links between directories work" >&5
+ if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+--- configure.in~
++++ configure.in 2006-04-13 08:18:04.000000000 +0200
+@@ -123,7 +123,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 libada"
++host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libada libgnatvsn"
+
+ # these tools are built for the host environment
+ # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+@@ -151,7 +151,8 @@
+ target-libgfortran \
+ target-libffi \
+ target-libobjc \
+- target-libada"
++ target-libada \
++ target-libgnatvsn"
+
+ # these tools are built using the target libraries, and are intended to
+ # run only in the target environment
+@@ -229,7 +230,7 @@
+
+ # Similarly, some are only suitable for cross toolchains.
+ # Remove these if host=target.
+-cross_only="target-libgloss target-newlib target-opcodes target-libada"
++cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn"
+
+ case $is_cross_compiler in
+ no) skipdirs="${skipdirs} ${cross_only}" ;;
+--- gnattools/Makefile.in~
++++ gnattools/Makefile.in 2006-04-13 18:53:40.000000000 +0200
+@@ -38,9 +38,10 @@
+ INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
+ ADA_CFLAGS=-g -O2 -gnatn
+ ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
++ADA_INCLUDES += -aO../libgnatvsn
+ LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
+ @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
+-ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
++ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -L../libgnatvsn -lgnatvsn
+
+ # We will use the just-built compiler to compile and link everything.
+ GCC=../gcc/xgcc -B../gcc/
+@@ -66,60 +67,34 @@
+ # 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
+-# libgnatvsn and libgnatprj.
++# libgnatprj.
+ GNATLINK_OBJS = \
+ ali.o \
+-alloc.o \
+ butil.o \
+-casing.o \
+-csets.o \
+-debug.o \
+ fmap.o \
+ fname.o \
+ gnatlink.o \
+-gnatvsn.o \
+-hostparm.o \
+ indepsw.o \
+-namet.o \
+-opt.o \
+ osint.o \
+-output.o \
+ prefix.o \
+ rident.o \
+ sdefault.o \
+ stylesw.o \
+ switch.o \
+-table.o \
+-tree_io.o \
+-types.o \
+-validsw.o \
+-version.o \
+-widechar.o
++validsw.o
+
+ GNATMAKE_OBJS = \
+ ali-util.o \
+ ali.o \
+-alloc.o \
+-atree.o \
+ binderr.o \
+ butil.o \
+-casing.o \
+-csets.o \
+-debug.o \
+-einfo.o\
+-elists.o \
+ err_vars.o \
+ erroutc.o \
+ errutil.o \
+ fmap.o \
+ fname-sf.o \
+ fname-uf.o \
+-fname.o \
+ gnatmake.o \
+-gnatvsn.o \
+-hostparm.o \
+-krunch.o \
+-lib.o \
+ make.o \
+ makeusg.o \
+ makeutl.o \
+@@ -128,12 +103,8 @@
+ mlib-tgt.o \
+ mlib-utl.o \
+ mlib.o \
+-namet.o \
+-nlists.o \
+-opt.o \
+ osint-m.o \
+ osint.o \
+-output.o \
+ prefix.o \
+ prj-attr-pm.o \
+ prj-attr.o \
+@@ -151,33 +122,19 @@
+ prj-util.o \
+ prj.o \
+ rident.o \
+-scans.o \
+ scng.o \
+ sdefault.o \
+ sfn_scan.o \
+-sinfo.o \
+ sinput-c.o \
+ sinput-p.o \
+-sinput.o \
+-snames.o \
+-stand.o \
+-stringt.o \
+ styleg.o \
+ stylesw.o \
+ switch-m.o \
+ switch.o \
+-table.o \
+ targparm.o \
+ tempdir.o \
+-tree_io.o \
+-types.o \
+-uintp.o \
+-uname.o \
+-urealp.o \
+ usage.o \
+ validsw.o \
+-version.o \
+-widechar.o \
+ $(EXTRA_GNATMAKE_OBJS)
+
+
+@@ -200,6 +157,7 @@
+ touch $@
+
+ gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
++gnattools-native: ../libgnatvsn/libgnatvsn.so
+ gnattools-native: stamp-gnattools-sources
+ gnattools-native: $(TOOLS) gnatbl
+
+@@ -211,14 +169,14 @@
+ vpath %.ads @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 and version.o.
++# of its object files, e.g. prefix.o.
+ vpath prefix.o ../gcc
+-vpath version.o ../gcc
+
+ # gnatlink
+
+ gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
+ $(GCC) -o $@ $^ \
++ ../libgnatvsn/libgnatvsn.a \
+ ../gcc/ada/rts/libgnat.a \
+ ../libiberty/libiberty.a
+
+@@ -235,6 +193,7 @@
+
+ gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
+ $(GCC) -o $@ $(ADA_CFLAGS) $^ \
++ ../libgnatvsn/libgnatvsn.a \
+ ../gcc/ada/rts/libgnat.a \
+ ../libiberty/libiberty.a
+
+@@ -248,7 +207,7 @@
+ ../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali
+
+ # Other tools
+-gnatchop gnatkr: version.o
++gnatchop gnatkr:
+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
+ --GCC="$(GCC)" \
+ --GNATBIND=../gcc/gnatbind
+@@ -260,7 +219,7 @@
+ cp -lp $< $@
+
+ gnatbind gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \
+-link.o version.o prefix.o
++link.o prefix.o
+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
+ --GCC="$(GCC)" \
+ --GNATBIND=../gcc/gnatbind
+@@ -269,7 +228,7 @@
+ --GCC="$(GCC) $(ADA_INCLUDES)"
+ strip $@
+
+-gnatbl: gnatbl.c link.o version.o prefix.o
++gnatbl: gnatbl.c link.o prefix.o
+ $(GCC) -o $@ $< $(CFLAGS) \
+ -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \
+ -I@srcdir@/../include \
+--- libgnatvsn/configure~
++++ libgnatvsn/configure 2006-04-13 08:18:04.000000000 +0200
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++# Minimal configure script for libgnatvsn. We're only interested in
++# a few parameters.
++
++for arg in $*; do
++ case ${arg} in
++ --build=*)
++ build=`expr ${arg} : '--build=\(.\+\)'`;;
++ --host=*)
++ host=`expr ${arg} : '--host=\(.\+\)'`;;
++ --target=*)
++ target=`expr ${arg} : '--target=\(.\+\)'`;;
++ --prefix=*)
++ prefix=`expr ${arg} : '--prefix=\(.\+\)'`;;
++ --srcdir=*)
++ srcdir=`expr ${arg} : '--srcdir=\(.\+\)'`;;
++ *)
++ echo "Warning: ignoring option: ${arg}"
++ esac
++done
++
++echo "build: ${build}" | tee config.log
++echo "host: ${host}" | tee -a config.log
++echo "target: ${target}" | tee -a config.log
++echo "prefix: ${prefix}" | tee -a config.log
++echo "srcdir: ${srcdir}" | tee -a config.log
++
++echo "Creating Makefile..." | tee -a config.log
++sed -e "s,@build@,${build}," \
++ -e "s,@host@,${host}," \
++ -e "s,@target@,${target}," \
++ -e "s,@prefix@,${prefix}," \
++ -e "s,@srcdir@,${srcdir}," < ${srcdir}/Makefile.in > Makefile
+--- libgnatvsn/Makefile.in~
++++ libgnatvsn/Makefile.in 2006-04-13 23:28:46.000000000 +0200
+@@ -0,0 +1,122 @@
++# Makefile for libgnatvsn.
++# 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: libgnatvsn
++
++.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
++CFLAGS := -g -O2 -gnatn
++BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER)
++DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
++DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
++
++ifneq (@build@,@host@)
++ CFLAGS += -b @host@
++endif
++
++.PHONY: libgnatvsn install
++libgnatvsn: libgnatvsn.so.$(LIB_VERSION) libgnatvsn.a
++
++VSN_SOURCES := alloc.ads atree.adb casing.adb csets.adb debug.adb einfo.adb \
++elists.adb fname.adb gnatvsn.adb hostparm.ads krunch.adb lib.adb namet.adb \
++nlists.adb opt.adb output.adb repinfo.adb scans.adb sinfo.adb sinput.adb \
++snames.adb stand.adb stringt.adb table.adb tree_in.adb tree_io.adb types.adb \
++uintp.adb uname.adb urealp.adb widechar.adb
++
++VSN_SEPARATES := lib-list.adb lib-sort.adb
++
++OBJECTS=$(patsubst %.ads,%.o,$(VSN_SOURCES:.adb=.o)) version.o
++
++vpath %.c @srcdir@/../gcc
++vpath %.ads @srcdir@/../gcc/ada
++vpath %.adb @srcdir@/../gcc/ada
++
++libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
++ : # Make libgnatvsn.so
++ $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \
++ -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
++ ln -s libgnatvsn.so.$(LIB_VERSION) libgnatvsn.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)): | obj-shared
++
++obj-shared/%.o: %.adb
++ $(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/%.o: %.ads
++ $(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/version.o: version.c
++ $(GCC) -c -fPIC -g -O2 \
++ -DBASEVER=\"$(BASEVER)\" \
++ -DDATESTAMP=\"$(DATESTAMP)\" \
++ -DDEVPHASE=\"$(DEVPHASE)\" \
++ $(realpath $<) -o $@
++
++obj-shared:
++ -mkdir $@
++
++libgnatvsn.a: $(addprefix obj-static/,$(OBJECTS))
++ : # Make libgnatvsn.a
++ ar rc $@ $^
++ ranlib $@
++
++$(addprefix obj-static/,$(OBJECTS)): | obj-static
++
++obj-static/%.o: %.adb
++ $(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/%.o: %.ads
++ $(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/version.o: version.c
++ $(GCC) -c -g -O2 \
++ -DBASEVER=\"$(BASEVER)\" \
++ -DDATESTAMP=\"$(DATESTAMP)\" \
++ -DDEVPHASE=\"$(DEVPHASE)\" \
++ $< -o $@
++
++obj-static:
++ -mkdir $@
++
++install: libgnatvsn
++ $(INSTALL_DATA) libgnatvsn.a $(DESTDIR)$(prefix)/lib
++ $(INSTALL_DATA) libgnatvsn.so.$(LIB_VERSION) $(DESTDIR)$(prefix)/lib
++ cd $(DESTDIR)$(prefix)/lib; \
++ ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
++ mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
++ $(INSTALL_DATA) \
++ $(addprefix @srcdir@/../gcc/ada/,$(VSN_SOURCES) $(VSN_SEPARATES)) \
++ $(addprefix @srcdir@/../gcc/ada/,$(patsubst %.adb,%.ads,$(filter %.adb,$(VSN_SOURCES)))) \
++ $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
++ mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
++ $(INSTALL) -m 0444 obj-shared/*.ali \
++ $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
++ chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn/*.ali
++
++.PHONY: clean
++clean:
++ rm -rf *.ali obj-static obj-shared libgnatvsn*
+--- Makefile.def~
++++ Makefile.def 2006-04-13 08:18:04.000000000 +0200
+@@ -118,6 +118,13 @@
+ missing= TAGS;
+ missing= install-info;
+ missing= installcheck; };
++host_modules= { module= libgnatvsn; 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;
+@@ -155,6 +162,13 @@
+ missing= TAGS;
+ missing= install-info;
+ missing= installcheck; };
++target_modules = { module= libgnatvsn; no_check=true;
++ missing= info;
++ missing= dvi;
++ missing= html;
++ missing= TAGS;
++ missing= install-info;
++ missing= installcheck; };
+
+ // These are (some of) the make targets to be done in each subdirectory.
+ // Not all; these are the ones which don't have special options.
+@@ -292,6 +306,8 @@
+ dependencies = { module=all-fixincludes; on=all-libiberty; };
+
+ dependencies = { module=all-gnattools; on=all-libada; };
++dependencies = { module=all-gnattools; on=all-libgnatvsn; };
++dependencies = { module=all-libgnatvsn; on=all-libada; };
+
+ // Host modules specific to gdb.
+ dependencies = { module=configure-gdb; on=configure-sim; };
+--- Makefile.in~
++++ Makefile.in 2006-04-13 08:18:04.000000000 +0200
+@@ -606,6 +606,7 @@
+ maybe-configure-libtermcap \
+ maybe-configure-utils \
+ maybe-configure-libada \
++ maybe-configure-libgnatvsn \
+ maybe-configure-gnattools
+ .PHONY: configure-target
+ configure-target: \
+@@ -627,7 +628,8 @@
+ maybe-configure-target-boehm-gc \
+ maybe-configure-target-qthreads \
+ maybe-configure-target-rda \
+- maybe-configure-target-libada
++ maybe-configure-target-libada \
++ maybe-configure-target-libgnatvsn
+
+ # The target built for a native non-bootstrap build.
+ .PHONY: all
+@@ -726,6 +728,7 @@
+ maybe-all-libtermcap \
+ maybe-all-utils \
+ maybe-all-libada \
++ maybe-all-libgnatvsn \
+ maybe-all-gnattools
+ .PHONY: all-target
+ all-target: \
+@@ -747,7 +750,8 @@
+ maybe-all-target-boehm-gc \
+ maybe-all-target-qthreads \
+ maybe-all-target-rda \
+- maybe-all-target-libada
++ maybe-all-target-libada \
++ maybe-all-target-libgnatvsn
+
+ # Do a target for all the subdirectories. A ``make do-X'' will do a
+ # ``make X'' in all subdirectories (because, in general, there is a
+@@ -833,6 +837,7 @@
+ maybe-info-libtermcap \
+ maybe-info-utils \
+ maybe-info-libada \
++ maybe-info-libgnatvsn \
+ maybe-info-gnattools
+
+ .PHONY: info-target
+@@ -855,7 +860,8 @@
+ maybe-info-target-boehm-gc \
+ maybe-info-target-qthreads \
+ maybe-info-target-rda \
+- maybe-info-target-libada
++ maybe-info-target-libada \
++ maybe-info-target-libgnatvsn
+
+ .PHONY: do-dvi
+ do-dvi:
+@@ -936,6 +942,7 @@
+ maybe-dvi-libtermcap \
+ maybe-dvi-utils \
+ maybe-dvi-libada \
++ maybe-dvi-libgnatvsn \
+ maybe-dvi-gnattools
+
+ .PHONY: dvi-target
+@@ -958,7 +965,8 @@
+ maybe-dvi-target-boehm-gc \
+ maybe-dvi-target-qthreads \
+ maybe-dvi-target-rda \
+- maybe-dvi-target-libada
++ maybe-dvi-target-libada \
++ maybe-dvi-target-libgnatvsn
+
+ .PHONY: do-html
+ do-html:
+@@ -1039,6 +1047,7 @@
+ maybe-html-libtermcap \
+ maybe-html-utils \
+ maybe-html-libada \
++ maybe-html-libgnatvsn \
+ maybe-html-gnattools
+
+ .PHONY: html-target
+@@ -1061,7 +1070,8 @@
+ maybe-html-target-boehm-gc \
+ maybe-html-target-qthreads \
+ maybe-html-target-rda \
+- maybe-html-target-libada
++ maybe-html-target-libada \
++ maybe-html-target-libgnatvsn
+
+ .PHONY: do-TAGS
+ do-TAGS:
+@@ -1142,6 +1152,7 @@
+ maybe-TAGS-libtermcap \
+ maybe-TAGS-utils \
+ maybe-TAGS-libada \
++ maybe-TAGS-libgnatvsn \
+ maybe-TAGS-gnattools
+
+ .PHONY: TAGS-target
+@@ -1164,7 +1175,8 @@
+ maybe-TAGS-target-boehm-gc \
+ maybe-TAGS-target-qthreads \
+ maybe-TAGS-target-rda \
+- maybe-TAGS-target-libada
++ maybe-TAGS-target-libada \
++ maybe-TAGS-target-libgnatvsn
+
+ .PHONY: do-install-info
+ do-install-info:
+@@ -1245,6 +1257,7 @@
+ maybe-install-info-libtermcap \
+ maybe-install-info-utils \
+ maybe-install-info-libada \
++ maybe-install-info-libgnatvsn \
+ maybe-install-info-gnattools
+
+ .PHONY: install-info-target
+@@ -1267,7 +1280,8 @@
+ maybe-install-info-target-boehm-gc \
+ maybe-install-info-target-qthreads \
+ maybe-install-info-target-rda \
+- maybe-install-info-target-libada
++ maybe-install-info-target-libada \
++ maybe-install-info-target-libgnatvsn
+
+ .PHONY: do-installcheck
+ do-installcheck:
+@@ -1348,6 +1362,7 @@
+ maybe-installcheck-libtermcap \
+ maybe-installcheck-utils \
+ maybe-installcheck-libada \
++ maybe-installcheck-libgnatvsn \
+ maybe-installcheck-gnattools
+
+ .PHONY: installcheck-target
+@@ -1370,7 +1385,8 @@
+ maybe-installcheck-target-boehm-gc \
+ maybe-installcheck-target-qthreads \
+ maybe-installcheck-target-rda \
+- maybe-installcheck-target-libada
++ maybe-installcheck-target-libada \
++ maybe-installcheck-target-libgnatvsn
+
+ .PHONY: do-mostlyclean
+ do-mostlyclean:
+@@ -1451,6 +1467,7 @@
+ maybe-mostlyclean-libtermcap \
+ maybe-mostlyclean-utils \
+ maybe-mostlyclean-libada \
++ maybe-mostlyclean-libgnatvsn \
+ maybe-mostlyclean-gnattools
+
+ .PHONY: mostlyclean-target
+@@ -1473,7 +1490,8 @@
+ maybe-mostlyclean-target-boehm-gc \
+ maybe-mostlyclean-target-qthreads \
+ maybe-mostlyclean-target-rda \
+- maybe-mostlyclean-target-libada
++ maybe-mostlyclean-target-libada \
++ maybe-mostlyclean-target-libgnatvsn
+
+ .PHONY: do-clean
+ do-clean:
+@@ -1554,6 +1572,7 @@
+ maybe-clean-libtermcap \
+ maybe-clean-utils \
+ maybe-clean-libada \
++ maybe-clean-libgnatvsn \
+ maybe-clean-gnattools
+
+ .PHONY: clean-target
+@@ -1576,7 +1595,8 @@
+ maybe-clean-target-boehm-gc \
+ maybe-clean-target-qthreads \
+ maybe-clean-target-rda \
+- maybe-clean-target-libada
++ maybe-clean-target-libada \
++ maybe-clean-target-libgnatvsn
+
+ .PHONY: do-distclean
+ do-distclean:
+@@ -1657,6 +1677,7 @@
+ maybe-distclean-libtermcap \
+ maybe-distclean-utils \
+ maybe-distclean-libada \
++ maybe-distclean-libgnatvsn \
+ maybe-distclean-gnattools
+
+ .PHONY: distclean-target
+@@ -1679,7 +1700,8 @@
+ maybe-distclean-target-boehm-gc \
+ maybe-distclean-target-qthreads \
+ maybe-distclean-target-rda \
+- maybe-distclean-target-libada
++ maybe-distclean-target-libada \
++ maybe-distclean-target-libgnatvsn
+
+ .PHONY: do-maintainer-clean
+ do-maintainer-clean:
+@@ -1760,6 +1782,7 @@
+ maybe-maintainer-clean-libtermcap \
+ maybe-maintainer-clean-utils \
+ maybe-maintainer-clean-libada \
++ maybe-maintainer-clean-libgnatvsn \
+ maybe-maintainer-clean-gnattools
+
+ .PHONY: maintainer-clean-target
+@@ -1782,7 +1805,8 @@
+ maybe-maintainer-clean-target-boehm-gc \
+ maybe-maintainer-clean-target-qthreads \
+ maybe-maintainer-clean-target-rda \
+- maybe-maintainer-clean-target-libada
++ maybe-maintainer-clean-target-libada \
++ maybe-maintainer-clean-target-libgnatvsn
+
+
+ # Here are the targets which correspond to the do-X targets.
+@@ -1919,6 +1943,7 @@
+ maybe-check-libtermcap \
+ maybe-check-utils \
+ maybe-check-libada \
++ maybe-check-libgnatvsn \
+ maybe-check-gnattools
+
+ .PHONY: check-target
+@@ -1941,7 +1966,8 @@
+ maybe-check-target-boehm-gc \
+ maybe-check-target-qthreads \
+ maybe-check-target-rda \
+- maybe-check-target-libada
++ maybe-check-target-libada \
++ maybe-check-target-libgnatvsn
+
+ do-check:
+ @: $(MAKE); $(unstage)
+@@ -2049,6 +2075,7 @@
+ maybe-install-libtermcap \
+ maybe-install-utils \
+ maybe-install-libada \
++ maybe-install-libgnatvsn \
+ maybe-install-gnattools
+
+ .PHONY: install-host
+@@ -2120,6 +2147,7 @@
+ maybe-install-libtermcap \
+ maybe-install-utils \
+ maybe-install-libada \
++ maybe-install-libgnatvsn \
+ maybe-install-gnattools
+
+ .PHONY: install-target
+@@ -2142,7 +2170,8 @@
+ maybe-install-target-boehm-gc \
+ maybe-install-target-qthreads \
+ maybe-install-target-rda \
+- maybe-install-target-libada
++ maybe-install-target-libada \
++ maybe-install-target-libgnatvsn
+
+ uninstall:
+ @echo "the uninstall target is not supported in this tree"
+@@ -28093,6 +28122,240 @@
+
+
+
++.PHONY: configure-libgnatvsn maybe-configure-libgnatvsn
++maybe-configure-libgnatvsn:
++@if libgnatvsn
++maybe-configure-libgnatvsn: configure-libgnatvsn
++configure-libgnatvsn:
++ @$(unstage)
++ @test ! -f $(HOST_SUBDIR)/libgnatvsn/Makefile || exit 0; \
++ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatvsn ; \
++ r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(HOST_EXPORTS) \
++ echo Configuring in $(HOST_SUBDIR)/libgnatvsn; \
++ cd "$(HOST_SUBDIR)/libgnatvsn" || exit 1; \
++ case $(srcdir) in \
++ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++ *) topdir=`echo $(HOST_SUBDIR)/libgnatvsn/ | \
++ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++ esac; \
++ srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \
++ libsrcdir="$$s/libgnatvsn"; \
++ $(SHELL) $${libsrcdir}/configure \
++ $(HOST_CONFIGARGS) $${srcdiroption} \
++ || exit 1
++@endif libgnatvsn
++
++
++
++
++
++.PHONY: all-libgnatvsn maybe-all-libgnatvsn
++maybe-all-libgnatvsn:
++@if libgnatvsn
++TARGET-libgnatvsn=all
++maybe-all-libgnatvsn: all-libgnatvsn
++all-libgnatvsn: configure-libgnatvsn
++ @$(unstage)
++ @r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(HOST_EXPORTS) \
++ (cd $(HOST_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgnatvsn))
++@endif libgnatvsn
++
++
++
++
++.PHONY: check-libgnatvsn maybe-check-libgnatvsn
++maybe-check-libgnatvsn:
++@if libgnatvsn
++maybe-check-libgnatvsn: check-libgnatvsn
++
++check-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: install-libgnatvsn maybe-install-libgnatvsn
++maybe-install-libgnatvsn:
++@if libgnatvsn
++maybe-install-libgnatvsn: install-libgnatvsn
++
++install-libgnatvsn: installdirs
++ @: $(MAKE); $(unstage)
++ @r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(HOST_EXPORTS) \
++ (cd $(HOST_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(FLAGS_TO_PASS) install)
++
++@endif libgnatvsn
++
++# Other targets (info, dvi, etc.)
++
++.PHONY: maybe-info-libgnatvsn info-libgnatvsn
++maybe-info-libgnatvsn:
++@if libgnatvsn
++maybe-info-libgnatvsn: info-libgnatvsn
++
++# libgnatvsn doesn't support info.
++info-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: maybe-dvi-libgnatvsn dvi-libgnatvsn
++maybe-dvi-libgnatvsn:
++@if libgnatvsn
++maybe-dvi-libgnatvsn: dvi-libgnatvsn
++
++# libgnatvsn doesn't support dvi.
++dvi-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: maybe-html-libgnatvsn html-libgnatvsn
++maybe-html-libgnatvsn:
++@if libgnatvsn
++maybe-html-libgnatvsn: html-libgnatvsn
++
++# libgnatvsn doesn't support html.
++html-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: maybe-TAGS-libgnatvsn TAGS-libgnatvsn
++maybe-TAGS-libgnatvsn:
++@if libgnatvsn
++maybe-TAGS-libgnatvsn: TAGS-libgnatvsn
++
++# libgnatvsn doesn't support TAGS.
++TAGS-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: maybe-install-info-libgnatvsn install-info-libgnatvsn
++maybe-install-info-libgnatvsn:
++@if libgnatvsn
++maybe-install-info-libgnatvsn: install-info-libgnatvsn
++
++# libgnatvsn doesn't support install-info.
++install-info-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: maybe-installcheck-libgnatvsn installcheck-libgnatvsn
++maybe-installcheck-libgnatvsn:
++@if libgnatvsn
++maybe-installcheck-libgnatvsn: installcheck-libgnatvsn
++
++# libgnatvsn doesn't support installcheck.
++installcheck-libgnatvsn:
++
++@endif libgnatvsn
++
++.PHONY: maybe-mostlyclean-libgnatvsn mostlyclean-libgnatvsn
++maybe-mostlyclean-libgnatvsn:
++@if libgnatvsn
++maybe-mostlyclean-libgnatvsn: mostlyclean-libgnatvsn
++
++mostlyclean-libgnatvsn:
++ @$(unstage)
++ @[ -f ./libgnatvsn/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 libgnatvsn" ; \
++ (cd $(HOST_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ mostlyclean) \
++ || exit 1
++
++@endif libgnatvsn
++
++.PHONY: maybe-clean-libgnatvsn clean-libgnatvsn
++maybe-clean-libgnatvsn:
++@if libgnatvsn
++maybe-clean-libgnatvsn: clean-libgnatvsn
++
++clean-libgnatvsn:
++ @$(unstage)
++ @[ -f ./libgnatvsn/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 libgnatvsn" ; \
++ (cd $(HOST_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ clean) \
++ || exit 1
++
++@endif libgnatvsn
++
++.PHONY: maybe-distclean-libgnatvsn distclean-libgnatvsn
++maybe-distclean-libgnatvsn:
++@if libgnatvsn
++maybe-distclean-libgnatvsn: distclean-libgnatvsn
++
++distclean-libgnatvsn:
++ @$(unstage)
++ @[ -f ./libgnatvsn/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 libgnatvsn" ; \
++ (cd $(HOST_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ distclean) \
++ || exit 1
++
++@endif libgnatvsn
++
++.PHONY: maybe-maintainer-clean-libgnatvsn maintainer-clean-libgnatvsn
++maybe-maintainer-clean-libgnatvsn:
++@if libgnatvsn
++maybe-maintainer-clean-libgnatvsn: maintainer-clean-libgnatvsn
++
++maintainer-clean-libgnatvsn:
++ @$(unstage)
++ @[ -f ./libgnatvsn/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 libgnatvsn" ; \
++ (cd $(HOST_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ maintainer-clean) \
++ || exit 1
++
++@endif libgnatvsn
++
++
++
+ .PHONY: configure-gnattools maybe-configure-gnattools
+ maybe-configure-gnattools:
+ @if gnattools
+@@ -34776,6 +35039,253 @@
+
+
+
++# There's only one multilib.out. Cleverer subdirs shouldn't need it copied.
++@if target-libgnatvsn
++$(TARGET_SUBDIR)/libgnatvsn/multilib.out: multilib.out
++ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
++ rm -f $(TARGET_SUBDIR)/libgnatvsn/Makefile || : ; \
++ cp multilib.out $(TARGET_SUBDIR)/libgnatvsn/multilib.out
++@endif target-libgnatvsn
++
++
++
++.PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
++maybe-configure-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-configure-target-libgnatvsn: configure-target-libgnatvsn
++configure-target-libgnatvsn: $(TARGET_SUBDIR)/libgnatvsn/multilib.out
++ @$(unstage)
++ @test ! -f $(TARGET_SUBDIR)/libgnatvsn/Makefile || exit 0; \
++ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
++ r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(NORMAL_TARGET_EXPORTS) \
++ echo Configuring in $(TARGET_SUBDIR)/libgnatvsn; \
++ cd "$(TARGET_SUBDIR)/libgnatvsn" || exit 1; \
++ case $(srcdir) in \
++ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++ *) topdir=`echo $(TARGET_SUBDIR)/libgnatvsn/ | \
++ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++ esac; \
++ srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \
++ libsrcdir="$$s/libgnatvsn"; \
++ rm -f no-such-file || : ; \
++ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
++ $(TARGET_CONFIGARGS) $${srcdiroption} \
++ || exit 1
++@endif target-libgnatvsn
++
++
++
++
++
++.PHONY: all-target-libgnatvsn maybe-all-target-libgnatvsn
++maybe-all-target-libgnatvsn:
++@if target-libgnatvsn
++TARGET-target-libgnatvsn=all
++maybe-all-target-libgnatvsn: all-target-libgnatvsn
++all-target-libgnatvsn: configure-target-libgnatvsn
++ @$(unstage)
++ @r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(NORMAL_TARGET_EXPORTS) \
++ (cd $(TARGET_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgnatvsn))
++@endif target-libgnatvsn
++
++
++
++
++
++.PHONY: check-target-libgnatvsn maybe-check-target-libgnatvsn
++maybe-check-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-check-target-libgnatvsn: check-target-libgnatvsn
++
++# Dummy target for uncheckable module.
++check-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: install-target-libgnatvsn maybe-install-target-libgnatvsn
++maybe-install-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-install-target-libgnatvsn: install-target-libgnatvsn
++
++install-target-libgnatvsn: installdirs
++ @: $(MAKE); $(unstage)
++ @r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(NORMAL_TARGET_EXPORTS) \
++ (cd $(TARGET_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
++
++@endif target-libgnatvsn
++
++# Other targets (info, dvi, etc.)
++
++.PHONY: maybe-info-target-libgnatvsn info-target-libgnatvsn
++maybe-info-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-info-target-libgnatvsn: info-target-libgnatvsn
++
++# libgnatvsn doesn't support info.
++info-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-dvi-target-libgnatvsn dvi-target-libgnatvsn
++maybe-dvi-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-dvi-target-libgnatvsn: dvi-target-libgnatvsn
++
++# libgnatvsn doesn't support dvi.
++dvi-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-html-target-libgnatvsn html-target-libgnatvsn
++maybe-html-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-html-target-libgnatvsn: html-target-libgnatvsn
++
++# libgnatvsn doesn't support html.
++html-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-TAGS-target-libgnatvsn TAGS-target-libgnatvsn
++maybe-TAGS-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-TAGS-target-libgnatvsn: TAGS-target-libgnatvsn
++
++# libgnatvsn doesn't support TAGS.
++TAGS-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-install-info-target-libgnatvsn install-info-target-libgnatvsn
++maybe-install-info-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-install-info-target-libgnatvsn: install-info-target-libgnatvsn
++
++# libgnatvsn doesn't support install-info.
++install-info-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-installcheck-target-libgnatvsn installcheck-target-libgnatvsn
++maybe-installcheck-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-installcheck-target-libgnatvsn: installcheck-target-libgnatvsn
++
++# libgnatvsn doesn't support installcheck.
++installcheck-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-mostlyclean-target-libgnatvsn mostlyclean-target-libgnatvsn
++maybe-mostlyclean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-mostlyclean-target-libgnatvsn: mostlyclean-target-libgnatvsn
++
++mostlyclean-target-libgnatvsn:
++ @: $(MAKE); $(unstage)
++ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++ r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(NORMAL_TARGET_EXPORTS) \
++ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++ for flag in $(EXTRA_TARGET_FLAGS); do \
++ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++ done; \
++ (cd $(TARGET_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ mostlyclean) \
++ || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-clean-target-libgnatvsn clean-target-libgnatvsn
++maybe-clean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-clean-target-libgnatvsn: clean-target-libgnatvsn
++
++clean-target-libgnatvsn:
++ @: $(MAKE); $(unstage)
++ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++ r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(NORMAL_TARGET_EXPORTS) \
++ echo "Doing clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++ for flag in $(EXTRA_TARGET_FLAGS); do \
++ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++ done; \
++ (cd $(TARGET_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ clean) \
++ || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-distclean-target-libgnatvsn distclean-target-libgnatvsn
++maybe-distclean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-distclean-target-libgnatvsn: distclean-target-libgnatvsn
++
++distclean-target-libgnatvsn:
++ @: $(MAKE); $(unstage)
++ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++ r=`${PWD_COMMAND}`; export r; \
++ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++ $(NORMAL_TARGET_EXPORTS) \
++ echo "Doing distclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++ for flag in $(EXTRA_TARGET_FLAGS); do \
++ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++ done; \
++ (cd $(TARGET_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ distclean) \
++ || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-maintainer-clean-target-libgnatvsn maintainer-clean-target-libgnatvsn
++maybe-maintainer-clean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-maintainer-clean-target-libgnatvsn: maintainer-clean-target-libgnatvsn
++
++maintainer-clean-target-libgnatvsn:
++ @: $(MAKE); $(unstage)
++ @[ -f $(TARGET_SUBDIR)/libgnatvsn/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)/libgnatvsn" ; \
++ for flag in $(EXTRA_TARGET_FLAGS); do \
++ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++ done; \
++ (cd $(TARGET_SUBDIR)/libgnatvsn && \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++ "RANLIB=$${RANLIB}" \
++ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++ maintainer-clean) \
++ || exit 1
++
++@endif target-libgnatvsn
++
++
++
+ # ----------
+ # GCC module
+ # ----------
+@@ -36215,6 +36725,8 @@
+
+ configure-target-libada: maybe-all-gcc
+
++configure-target-libgnatvsn: maybe-all-gcc
++
+
+
+ configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
+@@ -36440,6 +36952,8 @@
+ all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+ all-fixincludes: maybe-all-libiberty
+ all-gnattools: maybe-all-libada
++all-gnattools: maybe-all-libgnatvsn
++all-libgnatvsn: maybe-all-libada
+ configure-gdb: maybe-configure-sim
+ all-gdb: maybe-all-libiberty
+ all-gdb: maybe-all-opcodes
Index: rules.patch
===================================================================
RCS file: /var/lib/cvs/gcc-debian/F-590C83D3C4DDFAAC5F6B64349CB06DF2.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rules.patch 12 Apr 2006 06:41:34 -0000 1.8
+++ rules.patch 14 Apr 2006 16:11:43 -0000 1.9
@@ -66,7 +66,7 @@
debian_patches += ada-gcc-name ada-default-project-path #ada-names
debian_patches += ada-symbolic-tracebacks
ifeq ($(with_libgnat),yes)
- debian_patches += ada-link-lib
+ debian_patches += ada-link-lib ada-libgnatvsn
endif
ifeq ($(DEB_TARGET_ARCH)-$(distribution),ia64-Debian)
debian_patches += ignore-comp-fail
Index: rules2
===================================================================
RCS file: /var/lib/cvs/gcc-debian/F-7D4E0B8F974B84C66A57C8B7BA9C241B,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rules2 1 Apr 2006 14:11:50 -0000 1.5
+++ rules2 14 Apr 2006 16:11:43 -0000 1.6
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+.SUFFIXES:
+
include debian/rules.defs
include debian/rules.parameters
@@ -1161,24 +1163,6 @@
endif
endif
-# wondering, why this is necessary, the installation of the gnat tools
-# is tried from the general install above, but fails with:
-# install: cannot create regular file `<package-top-dir>/debian/tmp/usr/bin/gnatbl': No such file or directory
-#ifeq ($(with_ada),yes)
-# : # Install Ada components
-# PATH=$(PWD)/bin:$$PATH \
-# $(MAKE) -C $(builddir)/gcc \
-# CFLAGS="$(CFLAGS)" \
-# LDFLAGS="$(LDFLAGS)" \
-# BOOT_CFLAGS="$(BOOT_CFLAGS)" \
-# INSTALL="$(INSTALL)" \
-# prefix=$(PWD)/$(d)/$(PF) \
-# infodir=$(PWD)/$(d)/$(PF)/share/info \
-# mandir=$(PWD)/$(d)/$(PF)/share/man \
-# gxx_include_dir=$(PWD)/$(d)/$(cxx_inc_dir) \
-# ada.install-common
-#endif
-
ifneq ($(with_java),yes)
ifeq ($(with_fastjar),yes)
: # Install fastjar
Index: rules.d/binary-ada.mk
===================================================================
RCS file: /var/lib/cvs/gcc-debian/F-CA1EB4DE1FD7B6D08C3B30F45C1C079B.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rules.d/binary-ada.mk 2 Mar 2006 07:37:26 -0000 1.2
+++ rules.d/binary-ada.mk 14 Apr 2006 16:11:43 -0000 1.3
@@ -9,10 +9,12 @@
p_gnat = gnat-$(GNAT_VERSION)
p_lgnat = libgnat-$(GNAT_VERSION)
+p_lgnatvsn = libgnatvsn$(GNAT_VERSION)
p_gnatd = $(p_gnat)-doc
d_gnat = debian/$(p_gnat)
d_lgnat = debian/$(p_lgnat)
+d_lgnatvsn = debian/$(p_lgnatvsn)
d_gnatd = debian/$(p_gnatd)
GNAT_TOOLS = gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr gnatlink \
@@ -44,6 +46,7 @@
dh_testroot
mv $(install_stamp) $(install_stamp)-tmp
+ : # libgnat
rm -rf $(d_lgnat)
dh_installdirs -p$(p_lgnat) $(dirs_lgnat)
@@ -52,7 +55,7 @@
mv $(d)/$(gcc_lib_dir)/adalib/$$vlib.so.1 $(d)/$(PF)/$(libdir)/. ; \
rm -f $(d)/$(gcc_lib_dir)/adalib/$$lib.so.1; \
done
- DH_COMPAT=2 dh_movefiles -p$(p_lgnat) $(files_lgnat)
+ dh_movefiles -p$(p_lgnat) $(files_lgnat)
debian/dh_doclink -p$(p_lgnat) $(p_base)
@@ -86,19 +89,53 @@
trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+
+$(binary_stamp)-libgnatvsn:
+ : # libgnatvsn-dev
+ dh_movefiles -plibgnatvsn-dev usr/lib/ada/adalib/gnatvsn
+ dh_movefiles -plibgnatvsn-dev usr/share/ada/adainclude/gnatvsn
+ dh_install -plibgnatvsn-dev \
+ debian/gnatvsn.gpr usr/share/ada/adainclude
+ dh_movefiles -plibgnatvsn-dev usr/lib/libgnatvsn.a
+ dh_link -plibgnatvsn-dev \
+ usr/lib/libgnatvsn.so.$(GNAT_VERSION) \
+ usr/lib/libgnatvsn.so
+ dh_strip -plibgnatvsn-dev -X.a
+ dh_fixperms -plibgnatvsn-dev
+ debian/dh_doclink -plibgnatvsn-dev $(p_base)
+ dh_gencontrol -plibgnatvsn-dev -- -v$(DEB_VERSION) $(common_substvars)
+ dh_md5sums -plibgnatvsn-dev
+ dh_builddeb -plibgnatvsn-dev
+
+ : # libgnatvsn
+ dh_movefiles -p$(p_lgnatvsn) usr/lib/libgnatvsn.so.$(GNAT_VERSION)
+ debian/dh_doclink -p$(p_lgnatvsn) $(p_base)
+ dh_strip -p$(p_lgnatvsn)
+ dh_makeshlibs -p$(p_lgnatvsn) -V '$(p_lgnatvsn) (>= $(DEB_SOVERSION))'
+ cat debian/$(p_lgnatvsn)/DEBIAN/shlibs >> debian/shlibs.local
+ dh_shlibdeps -p$(p_lgnatvsn)
+ dh_gencontrol -p$(p_lgnatvsn) -- -v$(DEB_VERSION) $(common_substvars)
+ dh_installdeb -p$(p_lgnatvsn)
+ dh_md5sums -p$(p_lgnatvsn)
+ dh_builddeb -p$(p_lgnatvsn)
+
+ touch $@
+
+
ifeq ($(with_libgnat),yes)
$(binary_stamp)-ada: $(install_stamp) $(binary_stamp)-libgnat
+$(binary_stamp)-ada: $(binary_stamp)-libgnatvsn
else
$(binary_stamp)-ada: $(install_stamp)
endif
dh_testdir
dh_testroot
mv $(install_stamp) $(install_stamp)-tmp
-
+ : # gnat
rm -rf $(d_gnat)
dh_installdirs -p$(p_gnat) $(dirs_gnat)
-
- DH_COMPAT=2 dh_movefiles -p$(p_gnat) $(files_gnat)
+ dh_movefiles -p$(p_gnat) $(files_gnat)
ifeq ($(with_libgnat),yes)
for lib in lib{gnat,gnarl}; do \
@@ -132,12 +169,8 @@
dh_strip -p$(p_gnat)
dh_compress -p$(p_gnat)
dh_fixperms -p$(p_gnat)
- find $(d_gnat) -name '*.ali' | xargs chmod 444
-ifeq ($(with_libgnat),yes)
- dh_shlibdeps -p$(p_gnat) -L $(p_lgnat) -l $(d_lgnat)/$(PF)/$(libdir)
-else
+# find $(d_gnat) -name '*.ali' | xargs chmod 444
dh_shlibdeps -p$(p_gnat)
-endif
dh_gencontrol -p$(p_gnat) -- -v$(DEB_VERSION) $(common_substvars)
dh_installdeb -p$(p_gnat)
dh_md5sums -p$(p_gnat)
Index: gnatvsn.gpr
===================================================================
RCS file: gnatvsn.gpr
diff -N gnatvsn.gpr
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnatvsn.gpr 14 Apr 2006 16:11:43 -0000 1.1
@@ -0,0 +1,36 @@
+-- Project file for use with GNAT
+-- Copyright (c) 2005 Ludovic Brenta <ludovic@ludovic-brenta.org>
+--
+-- This program 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.
+--
+-- This project file is designed to help build applications that use
+-- GNAT project files. Here is an example of how to use this project file:
+--
+-- with "/usr/share/ada/adainclude/gnatvsn";
+-- project Example is
+-- for Object_Dir use "obj";
+-- for Exec_Dir use ".";
+-- for Main use ("example");
+-- package Linker renames Gnatvsn.Linker;
+-- -- Alternatively, if you need additional switches:
+-- -- package Linker is
+-- -- for Default_Switches ("Ada") use (Gnatvsn.Linker_Switches & ...)
+-- -- end Linker;
+-- end Example;
+
+project Gnatvsn is
+ for Source_Dirs use ("/usr/share/ada/adainclude/gnatvsn");
+ for Object_Dir use "/usr/lib/ada/adalib/gnatvsn";
+ Linker_Switches := "-lgnatvsn";
+ package Linker is
+ for Default_Switches ("Ada") use (Linker_Switches);
+ end Linker;
+end Gnatvsn;
Reply to: