[packages/libqalculate] - up to 5.0.0
mrozowik
mrozowik at pld-linux.org
Tue Mar 12 15:43:30 CET 2024
commit de8a341077792a7c404ee919330f06398ed1332b
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Tue Mar 12 14:01:09 2024 +0000
- up to 5.0.0
currencies.patch | 42 -
libqalculate-autotools.patch | 18496 -----------------------------------------
libqalculate.spec | 12 +-
pkgconfig_private.patch | 12 -
4 files changed, 3 insertions(+), 18559 deletions(-)
---
diff --git a/libqalculate.spec b/libqalculate.spec
index 6f93baf..6caf5cc 100644
--- a/libqalculate.spec
+++ b/libqalculate.spec
@@ -1,15 +1,13 @@
Summary: A modern multi-purpose calculator library
Summary(pl.UTF-8): Nowoczesna, wielozadaniowa biblioteka kalkulatora
Name: libqalculate
-Version: 4.9.0
+Version: 5.0.0
Release: 1
License: GPL
Group: Libraries
Source0: https://github.com/Qalculate/libqalculate/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: c129774b53e2bf1f0488214c99c7171a
-Patch0: pkgconfig_private.patch
-Patch1: currencies.patch
-URL: http://qalculate.github.io/
+# Source0-md5: 7283e883d79287a57d635bd9ff9a9932
+URL: https://qalculate.github.io/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cln-devel >= 1.3
@@ -60,8 +58,6 @@ Statyczna biblioteka qalculate.
%prep
%setup -q
-#%%patch0 -p1
-#%%patch1 -p1
%build
%{__libtoolize}
@@ -80,8 +76,6 @@ rm -rf $RPM_BUILD_ROOT
# obsoleted my .pc file
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libqalculate.la
-#%%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
%find_lang %{name}
%clean
diff --git a/currencies.patch b/currencies.patch
deleted file mode 100644
index fed6e4d..0000000
--- a/currencies.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-TODO:
-- LVL
-- LTL
-
---- libqalculate-0.9.7/data/currencies.xml 2010-01-05 17:26:32.000000000 +0200
-+++ libqalculate-0.9.7/data/currencies.xml 2015-10-24 19:53:16.000000000 +0300
-@@ -161,14 +161,6 @@
- <names>ar:CZK</names>
- <names xml:lang="zh_CN">ar:CZK</names>
- </builtin_unit>
-- <builtin_unit name="EEK">
-- <title>Estonian Kroon</title>
-- <title xml:lang="nl">Estlandse kroon</title>
-- <title xml:lang="sv">Estoniska kroon</title>
-- <title xml:lang="zh_CN">爱沙尼亚克鲁恩</title>
-- <names>ar:EEK</names>
-- <names xml:lang="zh_CN">ar:EEK</names>
-- </builtin_unit>
- <builtin_unit name="HUF">
- <title>Hungarian Forint</title>
- <title xml:lang="nl">Hongaarse forint</title>
-@@ -486,5 +478,18 @@
- <exponent>1</exponent>
- </base>
- </unit>
-+ <unit type="alias">
-+ <title>Estonian Kroon</title>
-+ <title xml:lang="nl">Estlandse kroon</title>
-+ <title xml:lang="sv">Estoniska kroon</title>
-+ <title xml:lang="zh_CN">爱沙尼亚克鲁恩</title>
-+ <names>ar:EEK,kroon</names>
-+ <names xml:lang="zh_CN">ar:EEK,kroon</names>
-+ <base>
-+ <unit>EUR</unit>
-+ <relation>1/15.6466</relation>
-+ <exponent>1</exponent>
-+ </base>
-+ </unit>
- </category>
--</QALCULATE>
-\ No newline at end of file
-+</QALCULATE>
diff --git a/libqalculate-autotools.patch b/libqalculate-autotools.patch
deleted file mode 100644
index c27f6db..0000000
--- a/libqalculate-autotools.patch
+++ /dev/null
@@ -1,18496 +0,0 @@
---- libqalculate-0.9.6.orig/config.guess
-+++ libqalculate-0.9.6/config.guess
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
- # Inc.
-
--timestamp='2007-01-15'
-+timestamp='2007-07-22'
-
- # 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
-@@ -139,23 +139,6 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
--if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-- eval $set_cc_for_build
-- cat << EOF > $dummy.c
-- #include <features.h>
-- #ifdef __UCLIBC__
-- # ifdef __UCLIBC_CONFIG_VERSION__
-- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-- # else
-- LIBC=uclibc
-- # endif
-- #else
-- LIBC=gnu
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
--fi
--
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -347,7 +330,7 @@
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
-@@ -808,12 +791,15 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[3456]*)
-- echo i586-pc-interix${UNAME_RELEASE}
-- exit ;;
-- EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
-- echo x86_64-unknown-interix${UNAME_RELEASE}
-- exit ;;
-+ *:Interix*:[3456]*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T | authenticamd)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-@@ -847,28 +833,28 @@
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- arm*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- avr32*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
-- echo cris-axis-linux-${LIBC}
-+ echo cris-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
-- echo crisv32-axis-linux-${LIBC}
-+ echo crisv32-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-unknown-linux-${LIBC}
-+ echo frv-unknown-linux-gnu
- exit ;;
- ia64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m68*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
-@@ -891,7 +877,7 @@
- s: ::g
- p
- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
-@@ -914,16 +900,16 @@
- s: ::g
- p
- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-- echo or32-unknown-linux-${LIBC}
-+ echo or32-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-${LIBC}
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-${LIBC}
-+ echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -936,40 +922,40 @@
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-- *) echo hppa-unknown-linux-${LIBC} ;;
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-${LIBC}
-+ echo hppa64-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- vax:Linux:*:*)
-- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
-- echo x86_64-unknown-linux-${LIBC}
-+ echo x86_64-unknown-linux-gnu
- exit ;;
- xtensa:Linux:*:*)
-- echo xtensa-unknown-linux-${LIBC}
-+ echo xtensa-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
-@@ -984,22 +970,20 @@
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
-- # This should get integrated into the C code below, but now we hack
-- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
---- libqalculate-0.9.6.orig/ltmain.sh
-+++ libqalculate-0.9.6/ltmain.sh
-@@ -43,8 +43,8 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.23b
--TIMESTAMP=" (1.1220.2.437 2007/02/17 09:08:45)"
-+VERSION="1.5.24 Debian 1.5.24-1"
-+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -275,21 +275,7 @@
- esac
- CC_quoted="$CC_quoted $arg"
- done
-- # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-- trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
-- # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
-- extendcc=${host}-${CC}
-- # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
-- # (Gentoo-specific hack because we always export $CHOST)
-- mungedcc=${CHOST-${host}}-${trimedcc}
- case "$@ " in
-- "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
-- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
-- tagname=CC
-- break ;;
-- "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
-- "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
-- "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
-@@ -895,7 +881,7 @@
- # Lock this critical section if it is needed
- # We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
-- until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
-+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
- $show "Waiting for $lockfile to be removed"
- sleep 2
- done
-@@ -1705,9 +1691,9 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
-- # in order for the loader to find any dlls it needs.
-+ # and Darwin in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
- fast_install=no
-@@ -2136,7 +2122,10 @@
- case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
-- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ link)
-+ libs="$deplibs %DEPLIBS%"
-+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+ ;;
- esac
- fi
- if test "$pass" = dlopen; then
-@@ -3253,9 +3242,15 @@
- age="0"
- ;;
- irix|nonstopux)
-- current=`expr $number_major + $number_minor - 1`
-+ current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_minor"
-+ lt_irix_increment=no
-+ ;;
-+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
- ;;
- esac
- ;;
-@@ -3314,7 +3309,8 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3328,8 +3324,11 @@
- ;;
-
- irix | nonstopux)
-- major=`expr $current - $age + 1`
--
-+ if test "X$lt_irix_increment" = "Xno"; then
-+ major=`expr $current - $age`
-+ else
-+ major=`expr $current - $age + 1`
-+ fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
-@@ -5451,11 +5450,6 @@
- $echo >> $output "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
--
-- # Make sure env LD_LIBRARY_PATH does not mess us up
-- if test -n \"\${LD_LIBRARY_PATH+set}\"; then
-- export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
-- fi
- "
- case $host in
- # Backslashes separate directories on plain windows
-@@ -5683,53 +5677,9 @@
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
-- if test "X$EGREP" = X ; then
-- EGREP=egrep
-- fi
-- # We do not want portage's install root ($D) present. Check only for
-- # this if the .la is being installed.
-- if test "$installed" = yes && test "$D"; then
-- eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
-- else
-- mynewdependency_lib="$libdir/$name"
-- fi
-- # Do not add duplicates
-- if test "$mynewdependency_lib"; then
-- my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-- if test -z "$my_little_ninja_foo_1"; then
-- newdependency_libs="$newdependency_libs $mynewdependency_lib"
-- fi
-- fi
-- ;;
-- *)
-- if test "$installed" = yes; then
-- # Rather use S=WORKDIR if our version of portage supports it.
-- # This is because some ebuild (gcc) do not use $S as buildroot.
-- if test "$PWORKDIR"; then
-- S="$PWORKDIR"
-- fi
-- # We do not want portage's build root ($S) present.
-- my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-- # We do not want portage's install root ($D) present.
-- my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
-- if test -n "$my_little_ninja_foo_2" && test "$S"; then
-- mynewdependency_lib=""
-- elif test -n "$my_little_ninja_foo_3" && test "$D"; then
-- eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
-- else
-- mynewdependency_lib="$deplib"
-- fi
-- else
-- mynewdependency_lib="$deplib"
-- fi
-- # Do not add duplicates
-- if test "$mynewdependency_lib"; then
-- my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-- if test -z "$my_little_ninja_foo_4"; then
-- newdependency_libs="$newdependency_libs $mynewdependency_lib"
-- fi
-- fi
-+ newdependency_libs="$newdependency_libs $libdir/$name"
- ;;
-+ *) newdependency_libs="$newdependency_libs $deplib" ;;
- esac
- done
- dependency_libs="$newdependency_libs"
-@@ -5781,10 +5731,6 @@
- case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- esac
-- # Do not add duplicates
-- if test "$installed" = yes && test "$D"; then
-- install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
-- fi
- $echo > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-@@ -6544,8 +6490,6 @@
- do
- eval "if test \"\${save_$lt_var+set}\" = set; then
- $lt_var=\$save_$lt_var; export $lt_var
-- else
-- $lt_unset $lt_var
- fi"
- done
-
---- libqalculate-0.9.6.orig/intltool-extract
-+++ libqalculate-0.9.6/intltool-extract
-@@ -0,0 +1,861 @@
-+#!/usr/bin/perl -w
-+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+
-+#
-+# The Intltool Message Extractor
-+#
-+# Copyright (C) 2000-2001, 2003 Free Software Foundation.
-+#
-+# Intltool 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.
-+#
-+# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Kenneth Christiansen <kenneth at gnu.org>
-+# Darin Adler <darin at bentspoon.com>
-+#
-+
-+## Release information
-+my $PROGRAM = "intltool-extract";
-+my $PACKAGE = "intltool";
-+my $VERSION = "0.36.2";
-+
-+## Loaded modules
-+use strict;
-+use File::Basename;
-+use Getopt::Long;
-+
-+## Scalars used by the option stuff
-+my $TYPE_ARG = "0";
-+my $LOCAL_ARG = "0";
-+my $HELP_ARG = "0";
-+my $VERSION_ARG = "0";
-+my $UPDATE_ARG = "0";
-+my $QUIET_ARG = "0";
-+my $SRCDIR_ARG = ".";
-+
-+my $FILE;
-+my $OUTFILE;
-+
-+my $gettext_type = "";
-+my $input;
-+my %messages = ();
-+my %loc = ();
-+my %count = ();
-+my %comments = ();
-+my $strcount = 0;
-+
-+my $XMLCOMMENT = "";
-+
-+## Use this instead of \w for XML files to handle more possible characters.
-+my $w = "[-A-Za-z0-9._:]";
-+
-+## Always print first
-+$| = 1;
-+
-+## Handle options
-+GetOptions (
-+ "type=s" => \$TYPE_ARG,
-+ "local|l" => \$LOCAL_ARG,
-+ "help|h" => \$HELP_ARG,
-+ "version|v" => \$VERSION_ARG,
-+ "update" => \$UPDATE_ARG,
-+ "quiet|q" => \$QUIET_ARG,
-+ "srcdir=s" => \$SRCDIR_ARG,
-+ ) or &error;
-+
-+&split_on_argument;
-+
-+
-+## Check for options.
-+## This section will check for the different options.
-+
-+sub split_on_argument {
-+
-+ if ($VERSION_ARG) {
-+ &version;
-+
-+ } elsif ($HELP_ARG) {
-+ &help;
-+
-+ } elsif ($LOCAL_ARG) {
-+ &place_local;
-+ &extract;
-+
-+ } elsif ($UPDATE_ARG) {
-+ &place_normal;
-+ &extract;
-+
-+ } elsif (@ARGV > 0) {
-+ &place_normal;
-+ &message;
-+ &extract;
-+
-+ } else {
-+ &help;
-+
-+ }
-+}
-+
-+sub place_normal {
-+ $FILE = $ARGV[0];
-+ $OUTFILE = "$FILE.h";
-+
-+ my $dirname = dirname ($OUTFILE);
-+ if (! -d "$dirname" && $dirname ne "") {
-+ system ("mkdir -p $dirname");
-+ }
-+}
-+
-+sub place_local {
-+ $FILE = $ARGV[0];
-+ $OUTFILE = fileparse($FILE, ());
-+ if (!-e "tmp/") {
-+ system("mkdir tmp/");
-+ }
-+ $OUTFILE = "./tmp/$OUTFILE.h"
-+}
-+
-+sub determine_type {
-+ if ($TYPE_ARG =~ /^gettext\/(.*)/) {
-+ $gettext_type=$1
-+ }
-+}
-+
-+## Sub for printing release information
-+sub version{
-+ print <<_EOF_;
-+${PROGRAM} (${PACKAGE}) $VERSION
-+Copyright (C) 2000, 2003 Free Software Foundation, Inc.
-+Written by Kenneth Christiansen, 2000.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+_EOF_
-+ exit;
-+}
-+
-+## Sub for printing usage information
-+sub help {
-+ print <<_EOF_;
-+Usage: ${PROGRAM} [OPTION]... [FILENAME]
-+Generates a header file from an XML source file.
-+
-+It grabs all strings between <_translatable_node> and its end tag in
-+XML files. Read manpage (man ${PROGRAM}) for more info.
-+
-+ --type=TYPE Specify the file type of FILENAME. Currently supports:
-+ "gettext/glade", "gettext/ini", "gettext/keys"
-+ "gettext/rfc822deb", "gettext/schemas",
-+ "gettext/scheme", "gettext/xml", "gettext/quoted"
-+ -l, --local Writes output into current working directory
-+ (conflicts with --update)
-+ --update Writes output into the same directory the source file
-+ reside (conflicts with --local)
-+ --srcdir Root of the source tree
-+ -v, --version Output version information and exit
-+ -h, --help Display this help and exit
-+ -q, --quiet Quiet mode
-+
-+Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-+or send email to <xml-i18n-tools\@gnome.org>.
-+_EOF_
-+ exit;
-+}
-+
-+## Sub for printing error messages
-+sub error{
-+ print STDERR "Try `${PROGRAM} --help' for more information.\n";
-+ exit;
-+}
-+
-+sub message {
-+ print "Generating C format header file for translation.\n" unless $QUIET_ARG;
-+}
-+
-+sub extract {
-+ &determine_type;
-+
-+ &convert;
-+
-+ open OUT, ">$OUTFILE";
-+ binmode (OUT) if $^O eq 'MSWin32';
-+ &msg_write;
-+ close OUT;
-+
-+ print "Wrote $OUTFILE\n" unless $QUIET_ARG;
-+}
-+
-+sub convert {
-+
-+ ## Reading the file
-+ {
-+ local (*IN);
-+ local $/; #slurp mode
-+ open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!";
-+ $input = <IN>;
-+ }
-+
-+ &type_ini if $gettext_type eq "ini";
-+ &type_keys if $gettext_type eq "keys";
-+ &type_xml if $gettext_type eq "xml";
-+ &type_glade if $gettext_type eq "glade";
-+ &type_scheme if $gettext_type eq "scheme";
-+ &type_schemas if $gettext_type eq "schemas";
-+ &type_rfc822deb if $gettext_type eq "rfc822deb";
-+ &type_quoted if $gettext_type eq "quoted";
-+}
-+
-+sub entity_decode_minimal
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+
-+ return $_;
-+}
-+
-+sub entity_decode
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/</</g;
-+ s/>/>/g;
-+ s/&/&/g;
-+
-+ return $_;
-+}
-+
-+sub escape_char
-+{
-+ return '\"' if $_ eq '"';
-+ return '\n' if $_ eq "\n";
-+ return '\\\\' if $_ eq '\\';
-+
-+ return $_;
-+}
-+
-+sub escape
-+{
-+ my ($string) = @_;
-+ return join "", map &escape_char, split //, $string;
-+}
-+
-+sub type_ini {
-+ ### For generic translatable desktop files ###
-+ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
-+ if (defined($2)) {
-+ $comments{$3} = $2;
-+ }
-+ $messages{$3} = [];
-+ }
-+}
-+
-+sub type_keys {
-+ ### For generic translatable mime/keys files ###
-+ while ($input =~ /^\s*_\w+=(.*)$/mg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub type_xml {
-+ ### For generic translatable XML files ###
-+ my $tree = readXml($input);
-+ parseTree(0, $tree);
-+}
-+
-+sub print_var {
-+ my $var = shift;
-+ my $vartype = ref $var;
-+
-+ if ($vartype =~ /ARRAY/) {
-+ my @arr = @{$var};
-+ print "[ ";
-+ foreach my $el (@arr) {
-+ print_var($el);
-+ print ", ";
-+ }
-+ print "] ";
-+ } elsif ($vartype =~ /HASH/) {
-+ my %hash = %{$var};
-+ print "{ ";
-+ foreach my $key (keys %hash) {
-+ print "$key => ";
-+ print_var($hash{$key});
-+ print ", ";
-+ }
-+ print "} ";
-+ } else {
-+ print $var;
-+ }
-+}
-+
-+# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ## differences comment)
-+sub getAttributeString
-+{
-+ my $sub = shift;
-+ my $do_translate = shift || 1;
-+ my $language = shift || "";
-+ my $translate = shift;
-+ my $result = "";
-+ foreach my $e (reverse(sort(keys %{ $sub }))) {
-+ my $key = $e;
-+ my $string = $sub->{$e};
-+ my $quote = '"';
-+
-+ $string =~ s/^[\s]+//;
-+ $string =~ s/[\s]+$//;
-+
-+ if ($string =~ /^'.*'$/)
-+ {
-+ $quote = "'";
-+ }
-+ $string =~ s/^['"]//g;
-+ $string =~ s/['"]$//g;
-+
-+ ## differences from intltool-merge.in.in
-+ if ($key =~ /^_/) {
-+ $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT;
-+ $messages{entity_decode($string)} = [];
-+ $$translate = 2;
-+ }
-+ ## differences end here from intltool-merge.in.in
-+ $result .= " $key=$quote$string$quote";
-+ }
-+ return $result;
-+}
-+
-+# Verbatim copy from intltool-merge.in.in
-+sub getXMLstring
-+{
-+ my $ref = shift;
-+ my $spacepreserve = shift || 0;
-+ my @list = @{ $ref };
-+ my $result = "";
-+
-+ my $count = scalar(@list);
-+ my $attrs = $list[0];
-+ my $index = 1;
-+
-+ $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-+ $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-+
-+ while ($index < $count) {
-+ my $type = $list[$index];
-+ my $content = $list[$index+1];
-+ if (! $type ) {
-+ # We've got CDATA
-+ if ($content) {
-+ # lets strip the whitespace here, and *ONLY* here
-+ $content =~ s/\s+/ /gs if (!$spacepreserve);
-+ $result .= $content;
-+ }
-+ } elsif ( "$type" ne "1" ) {
-+ # We've got another element
-+ $result .= "<$type";
-+ $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements
-+ if ($content) {
-+ my $subresult = getXMLstring($content, $spacepreserve);
-+ if ($subresult) {
-+ $result .= ">".$subresult . "</$type>";
-+ } else {
-+ $result .= "/>";
-+ }
-+ } else {
-+ $result .= "/>";
-+ }
-+ }
-+ $index += 2;
-+ }
-+ return $result;
-+}
-+
-+# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed
-+# Translate list of nodes if necessary
-+sub translate_subnodes
-+{
-+ my $fh = shift;
-+ my $content = shift;
-+ my $language = shift || "";
-+ my $singlelang = shift || 0;
-+ my $spacepreserve = shift || 0;
-+
-+ my @nodes = @{ $content };
-+
-+ my $count = scalar(@nodes);
-+ my $index = 0;
-+ while ($index < $count) {
-+ my $type = $nodes[$index];
-+ my $rest = $nodes[$index+1];
-+ traverse($fh, $type, $rest, $language, $spacepreserve);
-+ $index += 2;
-+ }
-+}
-+
-+# Based on traverse() in intltool-merge.in.in
-+sub traverse
-+{
-+ my $fh = shift; # unused, to allow us to sync code between -merge and -extract
-+ my $nodename = shift;
-+ my $content = shift;
-+ my $language = shift || "";
-+ my $spacepreserve = shift || 0;
-+
-+ if ($nodename && "$nodename" eq "1") {
-+ $XMLCOMMENT = $content;
-+ } elsif ($nodename) {
-+ # element
-+ my @all = @{ $content };
-+ my $attrs = shift @all;
-+ my $translate = 0;
-+ my $outattr = getAttributeString($attrs, 1, $language, \$translate);
-+
-+ if ($nodename =~ /^_/) {
-+ $translate = 1;
-+ $nodename =~ s/^_//;
-+ }
-+ my $lookup = '';
-+
-+ $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-+ $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-+
-+ if ($translate) {
-+ $lookup = getXMLstring($content, $spacepreserve);
-+ if (!$spacepreserve) {
-+ $lookup =~ s/^\s+//s;
-+ $lookup =~ s/\s+$//s;
-+ }
-+
-+ if ($lookup && $translate != 2) {
-+ $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT;
-+ $messages{$lookup} = [];
-+ } elsif ($translate == 2) {
-+ translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-+ }
-+ } else {
-+ $XMLCOMMENT = "";
-+ my $count = scalar(@all);
-+ if ($count > 0) {
-+ my $index = 0;
-+ while ($index < $count) {
-+ my $type = $all[$index];
-+ my $rest = $all[$index+1];
-+ traverse($fh, $type, $rest, $language, $spacepreserve);
-+ $index += 2;
-+ }
-+ }
-+ }
-+ $XMLCOMMENT = "";
-+ }
-+}
-+
-+
-+# Verbatim copy from intltool-merge.in.in, $fh for compatibility
-+sub parseTree
-+{
-+ my $fh = shift;
-+ my $ref = shift;
-+ my $language = shift || "";
-+
-+ my $name = shift @{ $ref };
-+ my $cont = shift @{ $ref };
-+
-+ while (!$name || "$name" eq "1") {
-+ $name = shift @{ $ref };
-+ $cont = shift @{ $ref };
-+ }
-+
-+ my $spacepreserve = 0;
-+ my $attrs = @{$cont}[0];
-+ $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-+
-+ traverse($fh, $name, $cont, $language, $spacepreserve);
-+}
-+
-+# Verbatim copy from intltool-merge.in.in
-+sub intltool_tree_comment
-+{
-+ my $expat = shift;
-+ my $data = $expat->original_string();
-+ my $clist = $expat->{Curlist};
-+ my $pos = $#$clist;
-+
-+ $data =~ s/^<!--//s;
-+ $data =~ s/-->$//s;
-+ push @$clist, 1 => $data;
-+}
-+
-+# Verbatim copy from intltool-merge.in.in
-+sub intltool_tree_cdatastart
-+{
-+ my $expat = shift;
-+ my $clist = $expat->{Curlist};
-+ my $pos = $#$clist;
-+
-+ push @$clist, 0 => $expat->original_string();
-+}
-+
-+# Verbatim copy from intltool-merge.in.in
-+sub intltool_tree_cdataend
-+{
-+ my $expat = shift;
-+ my $clist = $expat->{Curlist};
-+ my $pos = $#$clist;
-+
-+ $clist->[$pos] .= $expat->original_string();
-+}
-+
-+# Verbatim copy from intltool-merge.in.in
-+sub intltool_tree_char
-+{
-+ my $expat = shift;
-+ my $text = shift;
-+ my $clist = $expat->{Curlist};
-+ my $pos = $#$clist;
-+
-+ # Use original_string so that we retain escaped entities
-+ # in CDATA sections.
-+ #
-+ if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-+ $clist->[$pos] .= $expat->original_string();
-+ } else {
-+ push @$clist, 0 => $expat->original_string();
-+ }
-+}
-+
-+# Verbatim copy from intltool-merge.in.in
-+sub intltool_tree_start
-+{
-+ my $expat = shift;
-+ my $tag = shift;
-+ my @origlist = ();
-+
-+ # Use original_string so that we retain escaped entities
-+ # in attribute values. We must convert the string to an
-+ # @origlist array to conform to the structure of the Tree
-+ # Style.
-+ #
-+ my @original_array = split /\x/, $expat->original_string();
-+ my $source = $expat->original_string();
-+
-+ # Remove leading tag.
-+ #
-+ $source =~ s|^\s*<\s*(\S+)||s;
-+
-+ # Grab attribute key/value pairs and push onto @origlist array.
-+ #
-+ while ($source)
-+ {
-+ if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/)
-+ {
-+ $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s;
-+ push @origlist, $1;
-+ push @origlist, '"' . $2 . '"';
-+ }
-+ elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/)
-+ {
-+ $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s;
-+ push @origlist, $1;
-+ push @origlist, "'" . $2 . "'";
-+ }
-+ else
-+ {
-+ last;
-+ }
-+ }
-+
-+ my $ol = [ { @origlist } ];
-+
-+ push @{ $expat->{Lists} }, $expat->{Curlist};
-+ push @{ $expat->{Curlist} }, $tag => $ol;
-+ $expat->{Curlist} = $ol;
-+}
-+
-+# Copied from intltool-merge.in.in and added comment handler.
-+sub readXml
-+{
-+ my $xmldoc = shift || return;
-+ my $ret = eval 'require XML::Parser';
-+ if(!$ret) {
-+ die "You must have XML::Parser installed to run $0\n\n";
-+ }
-+ my $xp = new XML::Parser(Style => 'Tree');
-+ $xp->setHandlers(Char => \&intltool_tree_char);
-+ $xp->setHandlers(Start => \&intltool_tree_start);
-+ $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart);
-+ $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend);
-+
-+ ## differences from intltool-merge.in.in
-+ $xp->setHandlers(Comment => \&intltool_tree_comment);
-+ ## differences end here from intltool-merge.in.in
-+
-+ my $tree = $xp->parse($xmldoc);
-+ #print_var($tree);
-+
-+# <foo><!-- comment --><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
-+# would be:
-+# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar,
-+# [{}, 0, "Howdy", ref, [{}]], 0, "do" ] ]
-+
-+ return $tree;
-+}
-+
-+sub type_schemas {
-+ ### For schemas XML files ###
-+
-+ # FIXME: We should handle escaped < (less than)
-+ while ($input =~ /
-+ <locale\ name="C">\s*
-+ (<default>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/default>\s*)?
-+ (<short>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/short>\s*)?
-+ (<long>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/long>\s*)?
-+ <\/locale>
-+ /sgx) {
-+ my @totranslate = ($3,$6,$9);
-+ my @eachcomment = ($2,$5,$8);
-+ foreach (@totranslate) {
-+ my $currentcomment = shift @eachcomment;
-+ next if !$_;
-+ s/\s+/ /g;
-+ $messages{entity_decode_minimal($_)} = [];
-+ $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment));
-+ }
-+ }
-+}
-+
-+sub type_rfc822deb {
-+ ### For rfc822-style Debian configuration files ###
-+
-+ my $lineno = 1;
-+ my $type = '';
-+ while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg)
-+ {
-+ my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5);
-+ while ($pre =~ m/\n/g)
-+ {
-+ $lineno ++;
-+ }
-+ $lineno += length($newline);
-+ my @str_list = rfc822deb_split(length($underscore), $text);
-+ for my $str (@str_list)
-+ {
-+ $strcount++;
-+ $messages{$str} = [];
-+ $loc{$str} = $lineno;
-+ $count{$str} = $strcount;
-+ my $usercomment = '';
-+ while($pre =~ s/(^|\n)#([^\n]*)$//s)
-+ {
-+ $usercomment = "\n" . $2 . $usercomment;
-+ }
-+ $comments{$str} = $tag . $usercomment;
-+ }
-+ $lineno += ($text =~ s/\n//g);
-+ }
-+}
-+
-+sub rfc822deb_split {
-+ # Debian defines a special way to deal with rfc822-style files:
-+ # when a value contain newlines, it consists of
-+ # 1. a short form (first line)
-+ # 2. a long description, all lines begin with a space,
-+ # and paragraphs are separated by a single dot on a line
-+ # This routine returns an array of all paragraphs, and reformat
-+ # them.
-+ # When first argument is 2, the string is a comma separated list of
-+ # values.
-+ my $type = shift;
-+ my $text = shift;
-+ $text =~ s/^[ \t]//mg;
-+ return (split(/, */, $text, 0)) if $type ne 1;
-+ return ($text) if $text !~ /\n/;
-+
-+ $text =~ s/([^\n]*)\n//;
-+ my @list = ($1);
-+ my $str = '';
-+ for my $line (split (/\n/, $text))
-+ {
-+ chomp $line;
-+ if ($line =~ /^\.\s*$/)
-+ {
-+ # New paragraph
-+ $str =~ s/\s*$//;
-+ push(@list, $str);
-+ $str = '';
-+ }
-+ elsif ($line =~ /^\s/)
-+ {
-+ # Line which must not be reformatted
-+ $str .= "\n" if length ($str) && $str !~ /\n$/;
-+ $line =~ s/\s+$//;
-+ $str .= $line."\n";
-+ }
-+ else
-+ {
-+ # Continuation line, remove newline
-+ $str .= " " if length ($str) && $str !~ /\n$/;
-+ $str .= $line;
-+ }
-+ }
-+ $str =~ s/\s*$//;
-+ push(@list, $str) if length ($str);
-+ return @list;
-+}
-+
-+sub type_quoted {
-+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
-+ my $message = $1;
-+ my $before = $`;
-+ $message =~ s/\\\"/\"/g;
-+ $before =~ s/[^\n]//g;
-+ $messages{$message} = [];
-+ $loc{$message} = length ($before) + 2;
-+ }
-+}
-+
-+sub type_glade {
-+ ### For translatable Glade XML files ###
-+
-+ my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message";
-+
-+ while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
-+ # Glade sometimes uses tags that normally mark translatable things for
-+ # little bits of non-translatable content. We work around this by not
-+ # translating strings that only includes something like label4 or window1.
-+ $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/;
-+ }
-+
-+ while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
-+ for my $item (split (/\n/, $1)) {
-+ $messages{entity_decode($item)} = [];
-+ }
-+ }
-+
-+ ## handle new glade files
-+ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
-+ $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
-+ if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
-+ $comments{entity_decode($3)} = entity_decode($2) ;
-+ }
-+ }
-+ while ($input =~ /<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg) {
-+ $messages{entity_decode_minimal($2)} = [];
-+ }
-+}
-+
-+sub type_scheme {
-+ my ($line, $i, $state, $str, $trcomment, $char);
-+ for $line (split(/\n/, $input)) {
-+ $i = 0;
-+ $state = 0; # 0 - nothing, 1 - string, 2 - translatable string
-+ while ($i < length($line)) {
-+ if (substr($line,$i,1) eq "\"") {
-+ if ($state == 2) {
-+ $comments{$str} = $trcomment if ($trcomment);
-+ $messages{$str} = [];
-+ $str = '';
-+ $state = 0; $trcomment = "";
-+ } elsif ($state == 1) {
-+ $str = '';
-+ $state = 0; $trcomment = "";
-+ } else {
-+ $state = 1;
-+ $str = '';
-+ if ($i>0 && substr($line,$i-1,1) eq '_') {
-+ $state = 2;
-+ }
-+ }
-+ } elsif (!$state) {
-+ if (substr($line,$i,1) eq ";") {
-+ $trcomment = substr($line,$i+1);
-+ $trcomment =~ s/^;*\s*//;
-+ $i = length($line);
-+ } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) {
-+ $trcomment = "";
-+ }
-+ } else {
-+ if (substr($line,$i,1) eq "\\") {
-+ $char = substr($line,$i+1,1);
-+ if ($char ne "\"" && $char ne "\\") {
-+ $str = $str . "\\";
-+ }
-+ $i++;
-+ }
-+ $str = $str . substr($line,$i,1);
-+ }
-+ $i++;
-+ }
-+ }
-+}
-+
-+sub msg_write {
-+ my @msgids;
-+ if (%count)
-+ {
-+ @msgids = sort { $count{$a} <=> $count{$b} } keys %count;
-+ }
-+ else
-+ {
-+ @msgids = sort keys %messages;
-+ }
-+ for my $message (@msgids)
-+ {
-+ my $offsetlines = 1;
-+ $offsetlines++ if $message =~ /%/;
-+ if (defined ($comments{$message}))
-+ {
-+ while ($comments{$message} =~ m/\n/g)
-+ {
-+ $offsetlines++;
-+ }
-+ }
-+ print OUT "# ".($loc{$message} - $offsetlines). " \"$FILE\"\n"
-+ if defined $loc{$message};
-+ print OUT "/* ".$comments{$message}." */\n"
-+ if defined $comments{$message};
-+ print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
-+
-+ my @lines = split (/\n/, $message, -1);
-+ for (my $n = 0; $n < @lines; $n++)
-+ {
-+ if ($n == 0)
-+ {
-+ print OUT "char *s = N_(\"";
-+ }
-+ else
-+ {
-+ print OUT " \"";
-+ }
-+
-+ print OUT escape($lines[$n]);
-+
-+ if ($n < @lines - 1)
-+ {
-+ print OUT "\\n\"\n";
-+ }
-+ else
-+ {
-+ print OUT "\");\n";
-+ }
-+ }
-+ }
-+}
-+
---- libqalculate-0.9.6.orig/libqalculate.pc.in
-+++ libqalculate-0.9.6/libqalculate.pc.in
-@@ -5,7 +5,8 @@
-
- Name: libqalculate
- Description: libqalculate
--Requires: glib-2.0 libxml-2.0
-+Requires.private: glib-2.0 libxml-2.0 cln
- Version: @VERSION@
--Libs: -L${libdir} @CLN_LIBS@ -lpthread -lqalculate
--Cflags: -I${includedir} @CLN_CPPFLAGS@
-+Libs: -L${libdir} -lqalculate
-+Libs.private: -lpthread
-+Cflags: -I${includedir}
---- libqalculate-0.9.6.orig/config.h.in
-+++ libqalculate-0.9.6/config.h.in
-@@ -24,9 +24,6 @@
- /* Define if your <locale.h> file defines LC_MESSAGES. */
- #undef HAVE_LC_MESSAGES
-
--/* If CLN can be used */
--#undef HAVE_LIBCLN
--
- /* Define if the text port uses readline */
- #undef HAVE_LIBREADLINE
-
---- libqalculate-0.9.6.orig/Makefile.in
-+++ libqalculate-0.9.6/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -21,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -35,7 +34,54 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-+ $(srcdir)/libqalculate.pc.in $(top_srcdir)/configure AUTHORS \
-+ COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
-+ depcomp install-sh ltmain.sh missing mkinstalldirs
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES = libqalculate.pc
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(pkgconfig_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+ { test ! -d $(distdir) \
-+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -51,8 +97,7 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
--CLN_CONFIG = @CLN_CONFIG@
--CLN_CPPFLAGS = @CLN_CPPFLAGS@
-+CLN_CFLAGS = @CLN_CFLAGS@
- CLN_LIBS = @CLN_LIBS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
-@@ -88,14 +133,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_QALCULATE_DEFINITIONS_RULE = @INTLTOOL_QALCULATE_DEFINITIONS_RULE@
-@@ -108,7 +151,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -125,6 +167,7 @@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -152,6 +195,8 @@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
-+XML2_CFLAGS = @XML2_CFLAGS@
-+XML2_LIBS = @XML2_LIBS@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-@@ -162,6 +207,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -187,6 +234,7 @@
- localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
- prefix = @prefix@
-@@ -196,9 +244,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
- SUBDIRS = libqalculate src data po po-defs docs
--
- EXTRA_DIST = \
- autogen.sh \
- TODO \
-@@ -210,48 +256,44 @@
- xmldocs.make \
- libqalculate.pc.in
-
--
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libqalculate.pc
--subdir = .
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = libqalculate.pc
--DIST_SOURCES =
--DATA = $(pkgconfig_DATA)
--
--
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive
--DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
-- COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
-- config.guess config.h.in config.sub configure configure.in \
-- depcomp install-sh libqalculate.pc.in ltmain.sh missing \
-- mkinstalldirs
--DIST_SUBDIRS = $(SUBDIRS)
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
- .SUFFIXES:
--
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+am--refresh:
-+ @:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+ cd $(srcdir) && $(AUTOMAKE) --gnu \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
--Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ echo ' $(SHELL) ./config.status'; \
-+ $(SHELL) ./config.status;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+ esac;
-
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
--$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-- cd $(srcdir) && $(AUTOCONF)
-
--$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -263,14 +305,14 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--
--$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
-- touch $(srcdir)/config.h.in
-+ rm -f stamp-h1
-+ touch $@
-
- distclean-hdr:
- -rm -f config.h stamp-h1
--libqalculate.pc: $(top_builddir)/config.status libqalculate.pc.in
-+libqalculate.pc: $(top_builddir)/config.status $(srcdir)/libqalculate.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-
- mostlyclean-libtool:
-@@ -282,23 +324,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--pkgconfigDATA_INSTALL = $(INSTALL_DATA)
- install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
-- $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-
- uninstall-pkgconfigDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
-- rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -308,7 +349,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -320,7 +367,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -328,7 +375,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -349,7 +402,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -360,14 +413,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -376,19 +421,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -398,10 +446,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -424,24 +473,11 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = .
--distdir = $(PACKAGE)-$(VERSION)
--
--am__remove_distdir = \
-- { test ! -d $(distdir) \
-- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-- && rm -fr $(distdir); }; }
--
--GZIP_ENV = --best
--distuninstallcheck_listfiles = find . -type f -print
--distcleancheck_listfiles = find . -type f -print
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkinstalldirs) $(distdir)/. $(distdir)/po
-+ $(mkdir_p) $(distdir)/. $(distdir)/po
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
-@@ -453,7 +489,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -468,15 +504,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -487,19 +525,46 @@
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+ $(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+ $(am__remove_distdir)
-+
-+dist-shar: distdir
-+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+ $(am__remove_distdir)
-+
-+dist-zip: distdir
-+ -rm -f $(distdir).zip
-+ zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
- dist dist-all: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- # This target untars the dist file and tries a VPATH configuration. Then
- # it guarantees that the distribution is self-contained by making another
- # tarfile.
- distcheck: dist
-- $(am__remove_distdir)
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-+ case '$(DIST_ARCHIVES)' in \
-+ *.tar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ *.tar.bz2*) \
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.Z*) \
-+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+ *.shar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ *.zip*) \
-+ unzip $(distdir).zip ;;\
-+ esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
-@@ -519,19 +584,20 @@
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
-- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
-- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-- && rm -f $(distdir).tar.gz \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist \
-+ && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
-- @echo "$(distdir).tar.gz is ready for distribution" | \
-- sed 'h;s/./=/g;p;x;p;x'
-+ @(echo "$(distdir) archives ready for distribution: "; \
-+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -555,8 +621,9 @@
- all-am: Makefile $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
--
-+ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -576,7 +643,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -588,13 +655,15 @@
- distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-hdr \
-+ distclean-libtool distclean-tags
-
- dvi: dvi-recursive
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -631,25 +700,22 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive dist dist-all dist-gzip distcheck distclean \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+ check-am clean clean-generic clean-libtool clean-recursive \
-+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+ dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
-- distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-- info-recursive install install-am install-data install-data-am \
-- install-data-recursive install-exec install-exec-am \
-- install-exec-recursive install-info install-info-am \
-- install-info-recursive install-man install-pkgconfigDATA \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-+ distuninstallcheck dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
-+ install-exec-am install-info install-info-am install-man \
-+ install-pkgconfigDATA install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-pkgconfigDATA \
-- uninstall-recursive
-+ uninstall-pkgconfigDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- libqalculate-0.9.6.orig/configure
-+++ libqalculate-0.9.6/configure
-@@ -815,13 +815,16 @@
- AUTOMAKE
- AUTOHEADER
- MAKEINFO
--AMTAR
- install_sh
- STRIP
- INSTALL_STRIP_PROGRAM
-+mkdir_p
- AWK
- SET_MAKE
- am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
- MAINTAINER_MODE_TRUE
- MAINTAINER_MODE_FALSE
- MAINT
-@@ -869,14 +872,14 @@
- INTLTOOL_SCHEMAS_RULE
- INTLTOOL_THEME_RULE
- INTLTOOL_SERVICE_RULE
-+INTLTOOL_POLICY_RULE
-+XGETTEXT
-+MSGMERGE
-+MSGFMT
- INTLTOOL_EXTRACT
- INTLTOOL_MERGE
- INTLTOOL_UPDATE
- INTLTOOL_PERL
--INTLTOOL_ICONV
--INTLTOOL_MSGFMT
--INTLTOOL_MSGMERGE
--INTLTOOL_XGETTEXT
- ALL_LINGUAS
- DATADIRNAME
- build
-@@ -899,22 +902,21 @@
- QALCULATE_CURRENT
- QALCULATE_REVISION
- QALCULATE_AGE
--CLN_CONFIG
--CLN_CPPFLAGS
--CLN_LIBS
- PKG_CONFIG
-+CLN_CFLAGS
-+CLN_LIBS
- GLIB_CFLAGS
- GLIB_LIBS
-+XML2_CFLAGS
-+XML2_LIBS
- READLINE_LIBS
- QALCULATE_TEXT
- LN_QALCULATE
- QALCULATE_DEFS2DOC
- GETTEXT_PACKAGE
- USE_NLS
--MSGFMT
- MSGFMT_OPTS
- GMSGFMT
--XGETTEXT
- CATALOGS
- CATOBJEXT
- GMOFILES
-@@ -945,8 +947,12 @@
- F77
- FFLAGS
- PKG_CONFIG
-+CLN_CFLAGS
-+CLN_LIBS
- GLIB_CFLAGS
--GLIB_LIBS'
-+GLIB_LIBS
-+XML2_CFLAGS
-+XML2_LIBS'
-
-
- # Initialize some variables set by options.
-@@ -1524,18 +1530,17 @@
- Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-- --enable-maintainer-mode enable make rules and dependencies not useful
-- (and sometimes confusing) to the casual installer
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
- --disable-textport Disable compiling the text port
- --enable-defs2doc Enable compiling the definitions documentation generator
-- --disable-dependency-tracking Speeds up one-time builds
-- --enable-dependency-tracking Do not reject slow dependency extractors
-+ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors
- --enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-static[=PKGS] build static libraries [default=yes]
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
-- --disable-clntest Do not try to compile and run a test CLN program
-
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1544,8 +1549,6 @@
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-tags[=TAGS] include additional configurations [automatic]
-- --with-cln-prefix=PFX Prefix where CLN is installed (optional)
-- --with-cln-exec-prefix=PFX Exec prefix where CLN is installed (optional)
- --with-readline turn on readline default=yes, default tries -lncurses, -lcurses, -ltermcap
-
- Some influential environment variables:
-@@ -1563,8 +1566,12 @@
- F77 Fortran 77 compiler command
- FFLAGS Fortran 77 compiler flags
- PKG_CONFIG path to pkg-config utility
-+ CLN_CFLAGS C compiler flags for CLN, overriding pkg-config
-+ CLN_LIBS linker flags for CLN, overriding pkg-config
- GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
- GLIB_LIBS linker flags for GLIB, overriding pkg-config
-+ XML2_CFLAGS C compiler flags for XML2, overriding pkg-config
-+ XML2_LIBS linker flags for XML2, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1988,7 +1995,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--am__api_version="1.7"
-+am__api_version="1.9"
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
-@@ -2158,7 +2165,6 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm -f conftest.sed
-
--
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-
-@@ -2172,6 +2178,39 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+ # We used to keeping the `.' as first argument, in order to
-+ # allow $(mkdir_p) to be used without argument. As in
-+ # $(mkdir_p) $(somedir)
-+ # where $(somedir) is conditionally defined. However this is wrong
-+ # for two reasons:
-+ # 1. if the package is installed by a user who cannot write `.'
-+ # make install will fail,
-+ # 2. the above comment should most certainly read
-+ # $(mkdir_p) $(DESTDIR)$(somedir)
-+ # so it does not work when $(somedir) is undefined and
-+ # $(DESTDIR) is not.
-+ # To support the latter case, we have to write
-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+ # so the `.' trick is pointless.
-+ mkdir_p='mkdir -p --'
-+else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ for d in ./-p ./--version;
-+ do
-+ test -d $d && rmdir $d
-+ done
-+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+ if test -f "$ac_aux_dir/mkinstalldirs"; then
-+ mkdir_p='$(mkinstalldirs)'
-+ else
-+ mkdir_p='$(install_sh) -d'
-+ fi
-+fi
-+
- for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -2253,7 +2292,7 @@
- fi
- rmdir .tst 2>/dev/null
-
-- # test to see if srcdir already configured
-+# test to see if srcdir already configured
- if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-@@ -2301,9 +2340,6 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--
--AMTAR=${AMTAR-"${am_missing_run}tar"}
--
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
-@@ -2412,6 +2448,13 @@
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-
-
-
-@@ -3485,7 +3528,9 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -3513,9 +3558,14 @@
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
-@@ -4347,7 +4397,9 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -4375,9 +4427,14 @@
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
-@@ -4813,7 +4870,9 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -4841,9 +4900,14 @@
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
-@@ -4874,149 +4938,829 @@
- fi
-
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-
-
--{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
--echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; }
--if test "${am_cv_prog_cc_stdc+set}" = set; then
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
-- CC="$ac_save_CC $ac_arg"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--
--int
--main ()
--{
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_CC="gcc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- am_cv_prog_cc_stdc="$ac_arg"; break
-+ CC=$ac_ct_CC
-+ fi
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ CC="$ac_cv_prog_CC"
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="${ac_tool_prefix}cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
- done
--CC="$ac_save_CC"
-+done
-+IFS=$as_save_IFS
-
- fi
--
--if test -z "$am_cv_prog_cc_stdc"; then
-- { echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6; }
--else
-- { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; }
- fi
--case "x$am_cv_prog_cc_stdc" in
-- x|xno) ;;
-- *) CC="$CC $am_cv_prog_cc_stdc" ;;
--esac
--
--{ 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; }
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
-- CPP=
-+
-+ fi
- fi
--if test -z "$CPP"; then
-- if test "${ac_cv_prog_CPP+set}" = set; then
-+if test -z "$CC"; then
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # Double quotes because CPP needs to be expanded
-- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-- do
-- ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+ # We found a bogon in the path, so make sure we never use it.
-+ set dummy $ac_cv_prog_CC
-+ shift
-+ if test $# != 0; then
-+ # We chose a different compiler from the bogus one.
-+ # However, it has the same basename, so the bogon will be chosen
-+ # first if we set CC to just the basename; use the full file name.
-+ shift
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+ fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl.exe
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl.exe
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_CC="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+ test -n "$ac_ct_CC" && break
-+done
-+
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_compiler_gnu=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+depcc="$CC" am_compiler_list=
-+
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-+
-+ am_cv_CC_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CC_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCC_TRUE=
-+ am__fastdepCC_FALSE='#'
-+else
-+ am__fastdepCC_TRUE='#'
-+ am__fastdepCC_FALSE=
-+fi
-+
-+
-+
-+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-+
-+{ 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
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
-@@ -5605,6 +6349,7 @@
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-@@ -5625,24 +6370,18 @@
-
-
-
--# Use the tools built into the package, not the ones that are installed.
--INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
--
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
-
--# Extract the first word of "perl", so it can be a program name with args.
--set dummy perl; ac_word=$2
-+# Check the gettext tools to make sure they are GNU
-+# Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_PERL in
-+ case $XGETTEXT in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5652,7 +6391,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5663,49 +6402,26 @@
- ;;
- esac
- fi
--INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
--if test -n "$INTLTOOL_PERL"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
--echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
-+XGETTEXT=$ac_cv_path_XGETTEXT
-+if test -n "$XGETTEXT"; then
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
--if test -z "$INTLTOOL_PERL"; then
-- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--echo "$as_me: error: perl not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--echo "$as_me: error: perl 5.x required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test "x" != "xno-xml"; then
-- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
--echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6; }
-- else
-- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--fi
--
--# Extract the first word of "iconv", so it can be a program name with args.
--set dummy iconv; ac_word=$2
-+# Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_ICONV in
-+ case $MSGMERGE in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5715,7 +6431,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5723,14 +6439,13 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
- ;;
- esac
- fi
--INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
--if test -n "$INTLTOOL_ICONV"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
--echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
-+MSGMERGE=$ac_cv_path_MSGMERGE
-+if test -n "$MSGMERGE"; then
-+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+echo "${ECHO_T}$MSGMERGE" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -5741,12 +6456,12 @@
- set dummy msgfmt; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_MSGFMT in
-+ case $MSGFMT in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5756,7 +6471,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5764,71 +6479,51 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
- ;;
- esac
- fi
--INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
--if test -n "$INTLTOOL_MSGFMT"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
--echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
-+MSGFMT=$ac_cv_path_MSGFMT
-+if test -n "$MSGFMT"; then
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
--# Extract the first word of "msgmerge", so it can be a program name with args.
--set dummy msgmerge; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $INTLTOOL_MSGMERGE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
-- ;;
--esac
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
--INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
--if test -n "$INTLTOOL_MSGMERGE"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
--echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
-+# Use the tools built into the package, not the ones that are installed.
-+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-+
-+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
--# Extract the first word of "xgettext", so it can be a program name with args.
--set dummy xgettext; ac_word=$2
-+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-+
-+
-+# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_XGETTEXT in
-+ case $INTLTOOL_PERL in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-+ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5838,7 +6533,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5846,20 +6541,41 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
- ;;
- esac
- fi
--INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
--if test -n "$INTLTOOL_XGETTEXT"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
--echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
-+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-+if test -n "$INTLTOOL_PERL"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
-+if test -z "$INTLTOOL_PERL"; then
-+ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-+echo "$as_me: error: perl not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-+echo "$as_me: error: perl 5.x required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test "x" != "xno-xml"; then
-+ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
-+ else
-+ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-@@ -5878,7 +6594,7 @@
- main ()
- {
- extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
-+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
-@@ -6508,7 +7224,7 @@
- esac
- ;;
-
--interix3*)
-+interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-@@ -6528,7 +7244,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -6648,7 +7364,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6651 "configure"' > conftest.$ac_ext
-+ echo '#line 7367 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -7627,24 +8343,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
-
-@@ -8250,7 +8969,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -8432,67 +9151,6 @@
-
- test -z "$pic_mode" && pic_mode=default
-
--# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
--#
--# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
--# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
--# calls AC_LIBTOOL_CONFIG and creates libtool.
--#
--{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
--echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; }
--if test "x$ltmain" = "x" ; then
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- { { echo "$as_me:$LINENO: error:
--
--*** [Gentoo] sanity check failed! ***
--*** \$ltmain is not defined, please check the patch for consistency! ***
--" >&5
--echo "$as_me: error:
--
--*** [Gentoo] sanity check failed! ***
--*** \$ltmain is not defined, please check the patch for consistency! ***
--" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--gentoo_lt_version="1.5.23b"
--gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"`
--if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- { { echo "$as_me:$LINENO: error:
--
--*** [Gentoo] sanity check failed! ***
--*** libtool.m4 and ltmain.sh have a version mismatch! ***
--*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
--
--Please run:
--
-- libtoolize --copy --force
--
--if appropriate, please contact the maintainer of this
--package (or your distribution) for help.
--" >&5
--echo "$as_me: error:
--
--*** [Gentoo] sanity check failed! ***
--*** libtool.m4 and ltmain.sh have a version mismatch! ***
--*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
--
--Please run:
--
-- libtoolize --copy --force
--
--if appropriate, please contact the maintainer of this
--package (or your distribution) for help.
--" >&2;}
-- { (exit 1); exit 1; }; }
--else
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--fi
--
--
- # Use C for the default configuration in the libtool script
- tagname=
- lt_save_CC="$CC"
-@@ -8566,11 +9224,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8569: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9227: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8573: \$? = $ac_status" >&5
-+ echo "$as_me:9231: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8639,7 +9297,7 @@
- lt_prog_compiler_pic='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -8856,11 +9514,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8859: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9517: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8863: \$? = $ac_status" >&5
-+ echo "$as_me:9521: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8960,11 +9618,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8963: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9621: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8967: \$? = $ac_status" >&5
-+ echo "$as_me:9625: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -9174,7 +9832,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9224,12 +9882,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -9628,10 +10287,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -9773,7 +10432,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -9793,24 +10452,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs=no
- fi
- ;;
-
-@@ -10307,14 +10970,7 @@
- *) objformat=elf ;;
- esac
- fi
-- # Handle Gentoo/FreeBSD as it was Linux
-- case $host_vendor in
-- gentoo)
-- version_type=linux ;;
-- *)
-- version_type=freebsd-$objformat ;;
-- esac
--
-+ version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -10325,12 +10981,6 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
-- linux)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- need_lib_prefix=no
-- need_version=no
-- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-@@ -10409,7 +11059,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -10480,7 +11130,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -10493,6 +11143,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -11318,7 +11980,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11321 "configure"
-+#line 11983 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11418,7 +12080,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11421 "configure"
-+#line 12083 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11616,6 +12278,7 @@
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
-+ fix_srcfile_path \
- exclude_expsyms \
- include_expsyms; do
-
-@@ -11984,7 +12647,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols
-@@ -12708,10 +13371,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
<Skipped 14635 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libqalculate.git/commitdiff/de8a341077792a7c404ee919330f06398ed1332b
More information about the pld-cvs-commit
mailing list