Ubuntu (new upstream) gtksourceview 1.8.3-0ubuntu1
- From: Ubuntu Merge-o-Matic <mom ubuntu com>
- To: gtksourceview packages qa debian org
- Subject: Ubuntu (new upstream) gtksourceview 1.8.3-0ubuntu1
- Date: Mon, 08 Jan 2007 23:50:57 -0000
This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes. It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
Format: 1.7
Date: Mon, 8 Jan 2007 21:21:03 +0100
Source: gtksourceview
Binary: libgtksourceview-dev libgtksourceview-common libgtksourceview1.0-0 libgtksourceview-doc
Architecture: source
Version: 1.8.3-0ubuntu1
Distribution: feisty
Urgency: high
Maintainer: Andrew Lau <netsnipe users sourceforge net>
Changed-By: Sebastien Bacher <seb128 canonical com>
Description:
libgtksourceview-common - common files for the GTK+ syntax highlighting widget
libgtksourceview-dev - development files for the GTK+ syntax highlighting widget
libgtksourceview-doc - documentation for the GTK+ syntax highlighting widget
libgtksourceview1.0-0 - shared libraries for the GTK+ syntax highlighting widget
Closes: 195663 216946 217883 226215 255668 261119 265953 273495 273611 280235 285102 292658 311124 313169 328420 337025 343664 367975
Changes:
gtksourceview (1.8.3-0ubuntu1) feisty; urgency=low
.
* New upstream version:
- Added docbook lang file
- Added OCaml lang file
- Cleanup some mime types in lang files
- Updated translations
* debian/libgtksourceview-common.install:
- don't install ocaml.lang, the new version ship it
* debian/ocaml.lang:
- dropped, the new upstream version ship it
.
gtksourceview (1.8.2-1) unstable; urgency=medium
.
* New upstream stable release with new translations (ar, ne), translation
updates (et, gl, nb, pl), fixes in langage spec files (R, java, nemerle,
pascal, verilog, xml), fixes in the DTD for langage spec files, and a new
Relax NG schema for the langage spec files; zero code change.
.
gtksourceview (1.8.1-2) unstable; urgency=low
.
* Upload to unstable.
.
gtksourceview (1.8.1-1) experimental; urgency=low
.
* New upstream release; no API change.
* Use HTTP in watch file.
.
gtksourceview (1.8.0-1) experimental; urgency=low
.
* New upstream release.
* Small fix in the -dev depends.
* Require gnome-pkg-tools 0.7.
* Call clean-la.mk and gnome-versions.mk.
* Use ${gnome:Version} and ${gnome:NextVersion} to relax dependencies.
.
gtksourceview (1.7.2-1) experimental; urgency=low
.
* New upstream development releases, with API additions.
- Target at experimental.
- Bump shlibs to >= 1.7.2.
- Stop shipping boo.lang, integrated upstream.
* Sync with overrides and set libgtksourceview-common's Section to misc.
* Install gtk-doc documentation in the standard upstream directory.
- Drop --with-html-dir from configure args.
- Drop now useless libgtksourceview-doc.dirs.
- Update libgtksourceview-doc.install, libgtksourceview-doc.doc-base, and
libgtksourceview-doc.links.
- Drop /usr/share/doc/gtksourceview hierarchy.
- Add a preinst to manually drop symlinks on upgrades since dpkg can't
handle switching a pathname from symlink to directory.
- Add a prerm to manually drop the doc dir on downgrades since dpkg can't
handle switching a pathname from directory to symlink either.
* Add ${misc:Depends}.
* Update watch file to track all stable releases.
.
gtksourceview (1.6.2-1) unstable; urgency=low
.
* New upstream release; no API changes.
.
gtksourceview (1.6.1-3) unstable; urgency=low
.
* Readd boo.lang as it was removed from boo in 0.7.6.2237-1.
[debian/control, debian/control.in,
debian/libgtksourceview-common.install]
.
gtksourceview (1.6.1-2) unstable; urgency=medium
.
* Revert the shipping of boo.lang as I forgot to request its removal from
boo first. (Closes: #367975)
[debian/libgtksourceview-common.install]
* Bump up Debhelper compatibility level to 5.
[debian/compat, debian/control, debian/control.in]
.
gtksourceview (1.6.1-1) unstable; urgency=low
.
[ Loic Minier ]
* Sync with Ubuntu.
- New upstream releases.
. Bump up libgtk2.0-dev build-dep.
[debian/control, debian/control.in]
- Support the boo language and Replace the boo package which used to ship
it.
[debian/boo.lang, debian/control, debian/control.in,
debian/libgtksourceview-common.install]
* Distribution is unstable.
* Update Uploaders.
[debian/control, debian/control.in]
* Support the ocaml language, thanks to Eric Cooper. (Closes: #343664)
[debian/libgtksourceview-common.install, debian/ocaml.lang]
.
[ Josselin Mouette ]
* Make the package binNMU-safe.
+ Build-depend on dpkg-dev 1.13.19.
+ Use ${source:Version} and ${binary:Version}.
* Update watch file.
* Standards-version is 3.7.2.
* rules,*.install: use dh_install more cleanly.
* libgtksourceview-dev.install: remove the libtool file.
* libgtksourceview-dev depends on the exact libgtksourceview1.0-0
version.
.
gtksourceview (1.4.2-2) unstable; urgency=low
.
* Add CDBS' utils. [debian/rules]
* Enable building of static libraries. (Closes: #337025) [debian/rules]
.
gtksourceview (1.4.2-1) unstable; urgency=high
.
* Urgency high because of RC bug fix.
* New upstream release (only translations updates).
* Bump shlibs to >= 1.4. (Closes: #328420) [debian/rules]
* Don't play with symlinks to save the changelogs and READMEs, keep the doc
under /usr/share/gtksourceview, with symlinks in
/usr/share/doc/*/gtksourceview pointing to it.
[debian/libgtksourceview1.0-0.links, libgtksourceview-dev.links,
libgtksourceview-doc.links debian/rules]
.
gtksourceview (1.4.1-1) unstable; urgency=low
.
[ Andrew Lau ]
* Debian Standards-Version: 3.6.2
* New upstream release: fortran.lang, ruby.lang, sql.lang (closes: #313169)
- Drop patch. [debian/patches/00_sql-backslash.patch]
.
[ OndÅ?ej Surý ]
* GNOME Team upload.
.
[ Loic Minier ]
* New upstream release 1.4.1.
- Bump build-depends on libgnomeprintui2.2-dev to >= 2.8.
* Misc fixes taken from 1.4.1-0ubuntu1:
- Remove spurious space between package entries.
[debian/control, debian/control.in]
- Version libgtksourceview/libgtksourceview-common/dependencies in
>= ${Source-Version}. [debian/control, debian/control.in]
- Drop useless libgtksourceview-common deps.
[debian/control, debian/control.in]
.
gtksourceview (1.2.0-2) unstable; urgency=low
.
* Designate '\' as an escape character in sql.lang
+ [debian/patches/00_sql-backslash.patch]
(closes: #311124)
* [debian/rules]:
- Record compile-time dependency versions using dh_buildinfo
* Downgrade documentation from a dependency to a suggestion.
.
gtksourceview (1.2.0-1) unstable; urgency=medium
.
* New upstream release for GNOME 2.10
* [debian/control.in]:
- Bump build-dep version of libgnomevfs2-dev to guard against libhowl0
(non-free) linkage.
.
gtksourceview (1.1.93-1) unstable; urgency=low
.
* New upstream release.
.
gtksourceview (1.1.92-1) unstable; urgency=low
.
* New upstream release.
- Improved LaTeX comment handling.
(closes: #280235)
- Merged: [debian/patches/00_python-numeric.patch]
(closes: #285102)
- Fixed line number printing.
(closes: #292658)
.
gtksourceview (1.1.91-1) experimental; urgency=low
.
* New upstream developmental release for GNOME 2.9.x
- Removed: [debian/patches/01__R-lang.patch] (not a typo)
* Add Conflicts: with libgtksourceview-cil (<= 0.5-2) due to GtkSourceView
providing its own nemerle.lang file.
.
gtksourceview (1.1.90-1) experimental; urgency=low
.
* New upstream developmental release for GNOME 2.9.x
- Merged: [debian/patches/00_tcl-spec.patch]
* Improved numeric type highlighting in Python.
+ [debian/patches/00_python-numeric.patch]
Thanks: Leonardo Soto <leonardosoto tutopia com>
* Corrected mistake in R language specification file.
+ [debian/patches/01_R-lang.patch]
.
gtksourceview (1.1.1-1) unstable; urgency=low
.
* New upstream release for GNOME 2.8.1
.
gtksourceview (1.0.1-5) unstable; urgency=low
.
* Create symlink for GtkSourceView documentation under devhelp's default
search path.
(closes: #273495)
* New language specification file for TCL.
Thanks: Riccardo Lancellotti <riccardo weblab ing unimo it>
(closes: #273611)
.
gtksourceview (1.0.1-4) unstable; urgency=medium
.
* Added conflict with libgtksourceview-cil (<= 0.5-1) to enable upgrades.
(closes: #265953)
* Separated documentation into libgtksourceview-doc package.
.
gtksourceview (1.0.1-3) unstable; urgency=low
.
* Language specification files backported from CVS.
- Updated: ada.lang, perl.lang
- New: css.lang, fortran.lang, haskell.lang, javascript.lang, lua.lang,
pascal.lang, ruby.lang, texinfo.lang and vbnet.lang
(closes: #255668)
* Documentation now symlinked under /usr/share/doc/libgtk2.0-doc.
(closes: #261119)
.
gtksourceview (1.0.1-2) unstable; urgency=low
.
* GNOME Team Upload.
* Upload in unstable.
.
gtksourceview (1.0.1-1) experimental; urgency=low
.
* New upstream release.
.
gtksourceview (1.0.0-2) experimental; urgency=low
.
* GNOME team upload.
* debian/control.in: build-depend on libxml-parser-perl to fix a FTBFS.
.
gtksourceview (1.0.0-1) experimental; urgency=low
.
* New upstream release.
+ Corrects highlightning after an apostrophe (closes: #226215).
* rules: update minimal shlib dependency.
* control.in: require GNOME 2.6 versions of the libraries.
* patches/00_autoreconf.patch: removed, should no longer be needed now
upstream uses libtool 1.5.2.
.
gtksourceview (0.7.0-2) unstable; urgency=medium
.
* Regenerate autotools-dev/libtool files to work around -pthread linking
build failures.
(closes: #217883)
.
gtksourceview (0.7.0-1) unstable; urgency=low
.
* New upstream release.
(closes: #216946)
.
gtksourceview (0.6.0-1) unstable; urgency=low
.
* New upstream release.
* Debian Standards-Version: 3.6.1
.
gtksourceview (0.5.0-1) unstable; urgency=low
.
* New upstream release.
* Debian Standards-Version: 3.6.0
.
gtksourceview (0.4.0-1) unstable; urgency=low
.
* Initial Release of Debian GNU/Linux Packages.
(closes: #195663)
Files:
55e80a7719d687928a30f7b20b46db74 1614 libs optional gtksourceview_1.8.3-0ubuntu1.dsc
0fb5aed6ac386e26f2eabe209e5e839e 6126 libs optional gtksourceview_1.8.3-0ubuntu1.diff.gz
diff -pruN 1.8.2-1/aclocal.m4 1.8.3-0ubuntu1/aclocal.m4
--- 1.8.2-1/aclocal.m4 2006-12-13 12:03:05.000000000 +0000
+++ 1.8.3-0ubuntu1/aclocal.m4 2007-01-08 19:46:19.000000000 +0000
@@ -992,7 +992,8 @@ AC_SUBST($1)dnl
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [USE_NLS=yes
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
diff -pruN 1.8.2-1/ChangeLog 1.8.3-0ubuntu1/ChangeLog
--- 1.8.2-1/ChangeLog 2006-12-13 12:01:54.000000000 +0000
+++ 1.8.3-0ubuntu1/ChangeLog 2007-01-08 19:42:17.000000000 +0000
@@ -1,3 +1,51 @@
+=== gtksourceview 1.8.3 ===
+
+2006-12-13 Paolo Maggi <paolo gnome org>
+
+ * gtksourceview/configure.in:
+ * gtksourceview/README:
+ * gtksourceview/NEWS:
+
+ release 1.8.3
+
+2007-01-08 Paolo Borelli <pborelli katamail com>
+
+ * gtksourceview/language-specs/Makefile.am:
+ * gtksourceview/language-specs/ocaml.lang:
+
+ ocaml lang file by Eric Cooper (Bug #338344)
+
+2007-01-02 Joachim Noreiko <jnoreiko yahoo com>
+
+ * gtksourceview/language-specs/docbook.lang: split keywords list
+ to have under 250 elements. (Workaround for #110991.)
+
+2006-12-26 Joachim Noreiko <jnoreiko yahoo com>
+
+ * gtksourceview/language-specs/docbook.lang:
+ * gtksourceview/language-specs/Makefile.am:
+
+ added DocBook lang file
+
+2006-12-13 Paolo Maggi <paolo gnome org>
+
+ * gtksourceview/language-specs/ada.lang:
+ * gtksourceview/language-specs/c.lang:
+ * gtksourceview/language-specs/cpp.lang:
+ * gtksourceview/language-specs/csharp.lang:
+ * gtksourceview/language-specs/desktop.lang:
+ * gtksourceview/language-specs/diff.lang:
+ * gtksourceview/language-specs/javascript.lang:
+ * gtksourceview/language-specs/perl.lang:
+ * gtksourceview/language-specs/php.lang:
+ * gtksourceview/language-specs/po.lang:
+ * gtksourceview/language-specs/python.lang:
+ * gtksourceview/language-specs/ruby.lang:
+ * gtksourceview/language-specs/sh.lang:
+ * gtksourceview/language-specs/tcl.lang:
+ * gtksourceview/language-specs/xml.lang: mime-types cleanup (see
+ bug #352549)
+
=== gtksourceview 1.8.2 ===
2006-12-13 Paolo Maggi <paolo gnome org>
diff -pruN 1.8.2-1/configure 1.8.3-0ubuntu1/configure
--- 1.8.2-1/configure 2006-12-13 12:03:09.000000000 +0000
+++ 1.8.3-0ubuntu1/configure 2007-01-08 19:46:22.000000000 +0000
@@ -1,10 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gtksourceview 1.8.2.
+# Generated by GNU Autoconf 2.60 for gtksourceview 1.8.3.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview>.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -18,11 +19,35 @@ if test -n "${ZSH_VERSION+set}" && (emul
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
@@ -31,8 +56,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -46,18 +106,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- $as_unset $as_var
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -65,157 +126,386 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
fi
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=\$LINENO
+ as_lineno_2=\$LINENO
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+ :
+else
+ as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
+ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ done;;
+ esac
+done
+IFS=$as_save_IFS
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+_ASEOF
+}; then
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+(as_func_return () {
+ (exit $1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+ break
+fi
+
+fi
+
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+ if test $as_have_required = no; then
+ echo This script requires a shell more modern than all the
+ echo shells that I found on your system. Please install a
+ echo modern shell, or manually run the script under such a
+ echo shell if you do have one.
+ { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+ echo Please tell autoconf gnu org about your system,
+ echo including any error possibly output before this
+ echo message
+}
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
+ chmod +x "$as_me.lineno" ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -224,7 +514,19 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+# Find out whether ``test -x'' works. Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ as_executable_p="test -x"
+else
+ as_executable_p=:
+fi
+rm -f conf$$.file
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -233,15 +535,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
# Check that we are running under the correct shell.
@@ -397,34 +690,31 @@ tagnames=${tagnames+${tagnames},}CXX
tagnames=${tagnames+${tagnames},}F77
+exec 7<&0 </dev/null 6>&1
+
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
# Identity of this package.
PACKAGE_NAME='gtksourceview'
PACKAGE_TARNAME='gtksourceview'
-PACKAGE_VERSION='1.8.2'
-PACKAGE_STRING='gtksourceview 1.8.2'
+PACKAGE_VERSION='1.8.3'
+PACKAGE_STRING='gtksourceview 1.8.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview'
ac_unique_file="gtksourceview/gtksourcebuffer.h"
@@ -456,17 +746,212 @@ ac_includes_default="\
#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ACLOCAL_AMFLAGS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GTK_REQUIRED_VERSION GNOME_VFS_REQUIRED_VERSION LIBXML_REQUIRED_VERSION GNOME_PRINT_REQUIRED_VERSION GLIB_GENMARSHAL GLIB_MKENUMS WARN_CFLAGS DEPRECATED_FLAGS PKG_CONFIG ac_pt_PKG_CONFIG DEP_CFLAGS DEP_LIBS HAVE_GNOMEPRINT_TRUE HAVE_GNOMEPRINT_FALSE GNOMEPRINT_CFLAGS GNOMEPRINT_LIBS BUILD_GNU_REGEX_TRUE BUILD_GNU_REGEX_FALSE BUILD_TESTS_TRUE BUILD_TESTS_FALSE TESTS_CFLAGS TESTS_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+ACLOCAL_AMFLAGS
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+GREP
+EGREP
+LN_S
+ECHO
+AR
+RANLIB
+CPP
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CXXCPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+INTLTOOL_DESKTOP_RULE
+INTLTOOL_DIRECTORY_RULE
+INTLTOOL_KEYS_RULE
+INTLTOOL_PROP_RULE
+INTLTOOL_OAF_RULE
+INTLTOOL_PONG_RULE
+INTLTOOL_SERVER_RULE
+INTLTOOL_SHEET_RULE
+INTLTOOL_SOUNDLIST_RULE
+INTLTOOL_UI_RULE
+INTLTOOL_XAM_RULE
+INTLTOOL_KBD_RULE
+INTLTOOL_XML_RULE
+INTLTOOL_XML_NOMERGE_RULE
+INTLTOOL_CAVES_RULE
+INTLTOOL_SCHEMAS_RULE
+INTLTOOL_THEME_RULE
+INTLTOOL_SERVICE_RULE
+INTLTOOL_EXTRACT
+INTLTOOL_MERGE
+INTLTOOL_UPDATE
+INTLTOOL_PERL
+INTLTOOL_ICONV
+INTLTOOL_MSGFMT
+INTLTOOL_MSGMERGE
+INTLTOOL_XGETTEXT
+ALL_LINGUAS
+DATADIRNAME
+GTK_REQUIRED_VERSION
+GNOME_VFS_REQUIRED_VERSION
+LIBXML_REQUIRED_VERSION
+GNOME_PRINT_REQUIRED_VERSION
+GLIB_GENMARSHAL
+GLIB_MKENUMS
+WARN_CFLAGS
+DEPRECATED_FLAGS
+PKG_CONFIG
+DEP_CFLAGS
+DEP_LIBS
+HAVE_GNOMEPRINT_TRUE
+HAVE_GNOMEPRINT_FALSE
+GNOMEPRINT_CFLAGS
+GNOMEPRINT_LIBS
+BUILD_GNU_REGEX_TRUE
+BUILD_GNU_REGEX_FALSE
+BUILD_TESTS_TRUE
+BUILD_TESTS_FALSE
+TESTS_CFLAGS
+TESTS_LIBS
+GETTEXT_PACKAGE
+USE_NLS
+MSGFMT
+GMSGFMT
+XGETTEXT
+CATALOGS
+CATOBJEXT
+GMOFILES
+INSTOBJEXT
+INTLLIBS
+PO_IN_DATADIR_TRUE
+PO_IN_DATADIR_FALSE
+POFILES
+POSUB
+MKINSTALLDIRS
+HTML_DIR
+ENABLE_GTK_DOC_TRUE
+ENABLE_GTK_DOC_FALSE
+GTK_DOC_USE_LIBTOOL_TRUE
+GTK_DOC_USE_LIBTOOL_FALSE
+LIBOBJS
+LTLIBOBJS'
ac_subst_files=''
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+F77
+FFLAGS
+PKG_CONFIG
+DEP_CFLAGS
+DEP_LIBS
+GNOMEPRINT_CFLAGS
+GNOMEPRINT_LIBS
+TESTS_CFLAGS
+TESTS_LIBS'
+
# Initialize some variables set by options.
ac_init_help=
@@ -493,34 +978,48 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev=
continue
fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -542,12 +1041,18 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -555,7 +1060,17 @@ do
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
+ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
@@ -564,11 +1079,7 @@ do
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -595,6 +1106,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -619,13 +1136,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
+ | --localstate | --localstat | --localsta | --localst | --locals)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -690,6 +1210,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -746,11 +1276,7 @@ do
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "with_$ac_package='$ac_optarg'" ;;
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
@@ -759,7 +1285,7 @@ do
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -790,8 +1316,7 @@ Try \`$0 --help' for more information."
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
@@ -811,27 +1336,19 @@ if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
+# Be sure to have absolute directory names.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
do
- eval ac_val=$`echo $ac_var`
+ eval ac_val=\$$ac_var
case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -858,122 +1375,76 @@ test -n "$host_alias" && ac_tool_prefix=
test "$silent" = yes && exec 6>/dev/null
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
+
+
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$0" ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
- else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_DEP_CFLAGS_set=${DEP_CFLAGS+set}
-ac_env_DEP_CFLAGS_value=$DEP_CFLAGS
-ac_cv_env_DEP_CFLAGS_set=${DEP_CFLAGS+set}
-ac_cv_env_DEP_CFLAGS_value=$DEP_CFLAGS
-ac_env_DEP_LIBS_set=${DEP_LIBS+set}
-ac_env_DEP_LIBS_value=$DEP_LIBS
-ac_cv_env_DEP_LIBS_set=${DEP_LIBS+set}
-ac_cv_env_DEP_LIBS_value=$DEP_LIBS
-ac_env_GNOMEPRINT_CFLAGS_set=${GNOMEPRINT_CFLAGS+set}
-ac_env_GNOMEPRINT_CFLAGS_value=$GNOMEPRINT_CFLAGS
-ac_cv_env_GNOMEPRINT_CFLAGS_set=${GNOMEPRINT_CFLAGS+set}
-ac_cv_env_GNOMEPRINT_CFLAGS_value=$GNOMEPRINT_CFLAGS
-ac_env_GNOMEPRINT_LIBS_set=${GNOMEPRINT_LIBS+set}
-ac_env_GNOMEPRINT_LIBS_value=$GNOMEPRINT_LIBS
-ac_cv_env_GNOMEPRINT_LIBS_set=${GNOMEPRINT_LIBS+set}
-ac_cv_env_GNOMEPRINT_LIBS_value=$GNOMEPRINT_LIBS
-ac_env_TESTS_CFLAGS_set=${TESTS_CFLAGS+set}
-ac_env_TESTS_CFLAGS_value=$TESTS_CFLAGS
-ac_cv_env_TESTS_CFLAGS_set=${TESTS_CFLAGS+set}
-ac_cv_env_TESTS_CFLAGS_value=$TESTS_CFLAGS
-ac_env_TESTS_LIBS_set=${TESTS_LIBS+set}
-ac_env_TESTS_LIBS_value=$TESTS_LIBS
-ac_cv_env_TESTS_LIBS_set=${TESTS_LIBS+set}
-ac_cv_env_TESTS_LIBS_value=$TESTS_LIBS
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
#
# Report the --help message.
@@ -982,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtksourceview 1.8.2 to adapt to many kinds of systems.
+\`configure' configures gtksourceview 1.8.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1002,9 +1473,6 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
-
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -1022,15 +1490,22 @@ Fine tuning of the installation director
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/gtksourceview]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1048,7 +1523,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtksourceview 1.8.2:";;
+ short | recursive ) echo "Configuration of gtksourceview 1.8.3:";;
esac
cat <<\_ACEOF
@@ -1059,10 +1534,8 @@ Optional Features:
(and sometimes confusing) to the casual installer
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- --enable-static[=PKGS]
- build static libraries [default=no]
- --enable-shared[=PKGS]
- build shared libraries [default=yes]
+ --enable-static[=PKGS] build static libraries [default=no]
+ --enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
@@ -1080,8 +1553,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
- --with-tags[=TAGS]
- include additional configurations [automatic]
+ --with-tags[=TAGS] include additional configurations [automatic]
--with-html-dir=PATH path to installed docs
Some influential environment variables:
@@ -1089,8 +1561,8 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
@@ -1113,120 +1585,86 @@ it to find libraries and programs with n
Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview>.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
+ test -d "$ac_dir" || continue
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtksourceview configure 1.8.2
-generated by GNU Autoconf 2.59
+gtksourceview configure 1.8.3
+generated by GNU Autoconf 2.60
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit 0
+ exit
fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtksourceview $as_me 1.8.2, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+It was created by gtksourceview $as_me 1.8.3, which was
+generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
_ACEOF
+exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -1245,7 +1683,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -1259,6 +1697,7 @@ do
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
+IFS=$as_save_IFS
} >&5
@@ -1280,7 +1719,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
-ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1291,7 +1729,7 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1313,9 +1751,7 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
+ ac_configure_args="$ac_configure_args '$ac_arg'"
;;
esac
done
@@ -1326,8 +1762,8 @@ $as_unset ac_configure_args1 || test "${
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1340,20 +1776,34 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-}
+ esac |
+ sort
+)
echo
cat <<\_ASBOX
@@ -1364,22 +1814,28 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1391,26 +1847,24 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- sed "/^$/d" confdefs.h | sort
+ cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
- ' 0
+' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
# Predefined preprocessor variables.
@@ -1441,14 +1895,17 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1464,8 +1921,8 @@ if test -r "$cache_file"; then
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
esac
fi
else
@@ -1477,12 +1934,11 @@ fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1507,8 +1963,7 @@ echo "$as_me: current value: $ac_new_v
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1525,12 +1980,6 @@ echo "$as_me: error: run \`make distclea
{ (exit 1); exit 1; }; }
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
@@ -1555,37 +2004,48 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h"
am__api_version="1.9"
ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
- elif test -f $ac_dir/install.sh; then
+ elif test -f "$ac_dir/install.sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
- elif test -f $ac_dir/shtool; then
+ elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -1600,8 +2060,8 @@ ac_configure="$SHELL $ac_aux_dir/configu
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1623,7 +2083,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -1642,21 +2102,22 @@ case $as_dir/ in
;;
esac
done
+IFS=$as_save_IFS
fi
if test "${ac_cv_path_install+set}" = set; then
INSTALL=$ac_cv_path_install
else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
- # removed, or if the path is relative.
+ # removed, or if the value is a relative name.
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -1666,8 +2127,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -1709,20 +2170,20 @@ echo "$as_me: error: newly created file
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
# Double any \ or $. echo might interpret backslashes.
# By default was `s,x,x', remove it if useless.
cat <<\_ACEOF >conftest.sed
s/[\\$]/&&/g;s/;s,x,x,$//
_ACEOF
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1774,8 +2235,8 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -1788,54 +2249,57 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$AWK" && break
done
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
all:
- @echo 'ac_maketemp="$(MAKE)"'
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
rm -f conftest.make
fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -1868,7 +2332,7 @@ fi
# Define the identity of the package.
PACKAGE=gtksourceview
- VERSION=1.8.2
+ VERSION=1.8.3
cat >>confdefs.h <<_ACEOF
@@ -1906,8 +2370,8 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -1920,32 +2384,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -1958,27 +2424,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
fi
@@ -2002,17 +2482,17 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
- USE_MAINTAINER_MODE=$enableval
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
-fi;
- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+fi
+
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
@@ -2036,8 +2516,8 @@ 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
+{ 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
@@ -2050,32 +2530,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2088,36 +2570,51 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2130,74 +2627,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2211,7 +2668,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$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
@@ -2222,6 +2679,7 @@ do
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.
@@ -2239,22 +2697,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2267,36 +2726,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2309,29 +2770,45 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -2344,21 +2821,35 @@ 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
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -2383,46 +2874,70 @@ ac_clean_files="$ac_clean_files a.out a.
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort. b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions. Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- # Find the output, starting from the most likely. This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
- conftest.$ac_ext )
- # This is the source file.
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
break;;
* )
break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2435,19 +2950,23 @@ See \`config.log' for more details." >&2
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -2466,22 +2985,27 @@ See \`config.log' for more details." >&2
fi
fi
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
rm -f a.out a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -2492,9 +3016,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
break;;
* ) break;;
esac
@@ -2508,14 +3031,14 @@ See \`config.log' for more details." >&2
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2535,14 +3058,20 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
@@ -2560,12 +3089,12 @@ fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2588,24 +3117,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -2614,24 +3155,28 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2647,24 +3192,147 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: 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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -2673,12 +3341,20 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2694,12 +3370,12 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2733,12 +3409,17 @@ static char *f (char * (*g) (char **, in
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2753,205 +3434,74 @@ return f (e, argv, 0) != argv[0] || f
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
+ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
esac
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2959,7 +3509,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
DEPDIR="${am__leading_dot}deps"
- ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
@@ -2969,8 +3519,8 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
am__include="#"
am__quote=
_am_result=none
@@ -2997,15 +3547,15 @@ if test "$am__include" = "#"; then
fi
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
rm -f confinc confmf
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then
- enableval="$enable_dependency_tracking"
+ enableval=$enable_dependency_tracking;
+fi
-fi;
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -3025,8 +3575,8 @@ fi
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
+{ 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
@@ -3115,8 +3665,8 @@ else
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ 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
@@ -3145,8 +3695,8 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3168,7 +3718,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -3187,21 +3737,22 @@ case $as_dir/ in
;;
esac
done
+IFS=$as_save_IFS
fi
if test "${ac_cv_path_install+set}" = set; then
INSTALL=$ac_cv_path_install
else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
- # removed, or if the path is relative.
+ # removed, or if the value is a relative name.
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -3211,10 +3762,9 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-# Check whether --enable-static or --disable-static was given.
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
- p=${PACKAGE-default}
+ enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
@@ -3233,13 +3783,13 @@ if test "${enable_static+set}" = set; th
esac
else
enable_static=no
-fi;
+fi
+
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
- p=${PACKAGE-default}
+ enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
@@ -3258,12 +3808,12 @@ if test "${enable_shared+set}" = set; th
esac
else
enable_shared=yes
-fi;
+fi
+
-# Check whether --enable-fast-install or --disable-fast-install was given.
+# Check whether --enable-fast-install was given.
if test "${enable_fast_install+set}" = set; then
- enableval="$enable_fast_install"
- p=${PACKAGE-default}
+ enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
@@ -3282,64 +3832,94 @@ if test "${enable_fast_install+set}" = s
esac
else
enable_fast_install=yes
-fi;
+fi
+
# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
if test "${ac_cv_build+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
if test "${ac_cv_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
- ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
+fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3392,37 +3972,184 @@ done
fi
SED=$lt_cv_path_SED
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
+
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_GREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_EGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
- test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-fi;
+fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -3451,11 +4178,11 @@ echo $ECHO_N "checking for ld used by $C
;;
esac
elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
else
- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3488,17 +4215,17 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3512,20 +4239,20 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
if test "${lt_cv_ld_reload_flag+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_ld_reload_flag='-r'
fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
@@ -3542,8 +4269,8 @@ case $host_os in
;;
esac
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3591,23 +4318,23 @@ else
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
NM="$lt_cv_path_NM"
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ 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
+ { 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
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
fi
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3782,8 +4509,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
esac
fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3801,11 +4528,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
compiler=$CC
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
- enableval="$enable_libtool_lock"
+ enableval=$enable_libtool_lock;
+fi
-fi;
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
@@ -3832,7 +4559,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3835 "configure"' > conftest.$ac_ext
+ echo '#line 4562 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3917,8 +4644,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3944,24 +4671,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -3970,9 +4709,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3981,8 +4721,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
@@ -4019,8 +4759,8 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -4054,8 +4794,13 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -4080,9 +4825,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4092,8 +4838,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -4120,6 +4871,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -4137,8 +4889,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4161,8 +4913,13 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -4187,9 +4944,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4199,8 +4957,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -4227,6 +4990,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -4249,8 +5013,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4274,24 +5038,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4300,9 +5076,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -4358,6 +5135,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -4377,18 +5155,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4401,12 +5188,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -4429,9 +5218,9 @@ for ac_header in sys/types.h sys/stat.h
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -4445,24 +5234,36 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4471,12 +5272,14 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -4491,18 +5294,19 @@ done
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4513,24 +5317,36 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4539,15 +5355,16 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4556,8 +5373,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -4581,9 +5403,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -4607,25 +5430,24 @@ echo "$as_me: WARNING: $ac_header: s
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview ##
## ---------------------------------------------------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -4637,18 +5459,22 @@ fi
done
-ac_ext=cc
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4661,36 +5487,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$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
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+ { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CXX" && break
done
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4703,55 +5531,85 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$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_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CXX" && break
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CXX=$ac_ct_CXX
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ 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 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
fi
-
+ fi
+fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C++ compiler version" >&5
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4774,24 +5632,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4800,24 +5670,28 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
GXX=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4833,24 +5707,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4859,70 +5745,53 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4931,62 +5800,92 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- break
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_ext=cc
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -4994,8 +5893,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
depcc="$CXX" am_compiler_list=
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+{ 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_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5084,8 +5983,8 @@ else
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -5106,13 +6005,13 @@ fi
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5142,8 +6041,13 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -5168,9 +6072,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5180,8 +6085,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -5208,6 +6118,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -5225,8 +6136,8 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
@@ -5249,8 +6160,13 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -5275,9 +6191,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5287,8 +6204,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -5315,6 +6237,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -5330,7 +6253,7 @@ See \`config.log' for more details." >&2
{ (exit 1); exit 1; }; }
fi
-ac_ext=cc
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5344,12 +6267,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5362,36 +6285,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$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
F77=$ac_cv_prog_F77
if test -n "$F77"; then
- echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
+ { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$F77" && break
done
fi
if test -z "$F77"; then
ac_ct_F77=$F77
- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5404,48 +6329,78 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$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_F77=$ac_cv_prog_ac_ct_F77
if test -n "$ac_ct_F77"; then
- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_F77" && break
done
- F77=$ac_ct_F77
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ 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 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ F77=$ac_ct_F77
+ fi
fi
# Provide some information about the compiler.
-echo "$as_me:5434:" \
- "checking for Fortran 77 compiler version" >&5
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -5455,8 +6410,8 @@ rm -f a.out
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5469,24 +6424,36 @@ else
end
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -5495,20 +6462,21 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
ac_ext=$ac_save_ext
ac_test_FFLAGS=${FFLAGS+set}
ac_save_FFLAGS=$FFLAGS
FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5519,24 +6487,36 @@ cat >conftest.$ac_ext <<_ACEOF
end
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -5545,13 +6525,14 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_f77_g=no
+ ac_cv_prog_f77_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
@@ -5580,8 +6561,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
if test "${lt_cv_sys_max_cmd_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5689,19 +6670,19 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
else
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5905,15 +6886,15 @@ if test -z "$lt_cv_sys_global_symbol_pip
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
+ { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
else
- echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
fi
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5927,8 +6908,8 @@ else
fi
rmdir .libs 2>/dev/null
fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
@@ -5979,8 +6960,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5993,32 +6974,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+ { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6031,27 +7014,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- AR=$ac_ct_AR
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ 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 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
else
AR="$ac_cv_prog_AR"
fi
@@ -6059,8 +7056,8 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6073,32 +7070,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6111,27 +7110,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
fi
@@ -6139,8 +7152,8 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6153,32 +7166,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6191,27 +7206,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
fi
@@ -6270,8 +7299,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6323,17 +7352,17 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6385,11 +7414,11 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
else
@@ -6404,21 +7433,21 @@ esac
enable_dlopen=no
enable_win32_dll=no
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
- enableval="$enable_libtool_lock"
+ enableval=$enable_libtool_lock;
+fi
-fi;
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-# Check whether --with-pic or --without-pic was given.
+# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then
- withval="$with_pic"
- pic_mode="$withval"
+ withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-fi;
+fi
+
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
@@ -6476,8 +7505,8 @@ if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6494,11 +7523,11 @@ else
-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:6497: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7526: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6501: \$? = $ac_status" >&5
+ echo "$as_me:7530: \$? = $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.
@@ -6511,8 +7540,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -6526,8 +7555,8 @@ lt_prog_compiler_wl=
lt_prog_compiler_pic=
lt_prog_compiler_static=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -6736,16 +7765,16 @@ echo $ECHO_N "checking for $compiler opt
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6762,11 +7791,11 @@ else
-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:6765: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7794: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6769: \$? = $ac_status" >&5
+ echo "$as_me:7798: \$? = $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.
@@ -6779,8 +7808,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
@@ -6807,8 +7836,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6835,8 +7864,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
if test x"$lt_prog_compiler_static_works" = xyes; then
:
@@ -6845,8 +7874,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6866,11 +7895,11 @@ else
-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:6869: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7898: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6873: \$? = $ac_status" >&5
+ echo "$as_me:7902: \$? = $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
@@ -6892,23 +7921,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -6918,8 +7947,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag=
@@ -7334,24 +8363,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -7365,8 +8406,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7395,24 +8438,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -7426,8 +8481,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7876,8 +8933,8 @@ if test -z "$aix_libpath"; then aix_libp
esac
fi
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
#
@@ -7897,8 +8954,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7935,16 +8992,16 @@ echo $ECHO_N "checking whether -lc shoul
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8335,7 +9392,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8338 "configure"' > conftest.$ac_ext
+ echo '#line 9395 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8552,8 +9609,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8561,8 +9618,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
@@ -8586,8 +9643,8 @@ else
# directories.
hardcode_action=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
if test "$hardcode_action" = relink; then
# Fast installation is not supported
@@ -8600,29 +9657,29 @@ fi
striplib=
old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
;;
*)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
;;
esac
fi
@@ -8654,8 +9711,8 @@ else
darwin*)
# if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8668,40 +9725,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8710,14 +9779,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -8731,8 +9801,8 @@ fi
;;
*)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8759,53 +9829,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef shl_load
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char shl_load ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+#if defined __stub_shl_load || defined __stub___shl_load
choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != shl_load;
+return shl_load ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8814,18 +9890,19 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shl_load=no
+ ac_cv_func_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
if test $ac_cv_func_shl_load = yes; then
lt_cv_dlopen="shl_load"
else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8838,40 +9915,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char shl_load ();
int
main ()
{
-shl_load ();
+return shl_load ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8880,19 +9969,20 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8919,53 +10009,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef dlopen
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dlopen ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+#if defined __stub_dlopen || defined __stub___dlopen
choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != dlopen;
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8974,18 +10070,19 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_dlopen=no
+ ac_cv_func_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
if test $ac_cv_func_dlopen = yes; then
lt_cv_dlopen="dlopen"
else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8998,40 +10095,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9040,19 +10149,20 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9065,40 +10175,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9107,19 +10229,20 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
if test $ac_cv_lib_svld_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9132,40 +10255,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dld_link ();
int
main ()
{
-dld_link ();
+return dld_link ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9174,14 +10309,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
@@ -9221,8 +10357,8 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9232,7 +10368,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9235 "configure"
+#line 10371 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9316,13 +10452,13 @@ rm -fr conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9332,7 +10468,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9335 "configure"
+#line 10471 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9416,8 +10552,8 @@ rm -fr conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
fi
CPPFLAGS="$save_CPPFLAGS"
@@ -9439,13 +10575,13 @@ fi
# Report which library types will actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -9465,15 +10601,15 @@ aix4* | aix5*)
fi
;;
esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -9965,11 +11101,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
-# Check whether --with-tags or --without-tags was given.
+# Check whether --with-tags was given.
if test "${with_tags+set}" = set; then
- withval="$with_tags"
- tagnames="$withval"
-fi;
+ withval=$with_tags; tagnames="$withval"
+fi
+
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
@@ -10023,7 +11159,7 @@ echo "$as_me: error: tag name \"$tagname
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -10142,18 +11278,18 @@ if test "$GXX" = yes; then
# Set up default GNU C++ configuration
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
- test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-fi;
+fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -10182,11 +11318,11 @@ echo $ECHO_N "checking for ld used by $C
;;
esac
elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
else
- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10219,17 +11355,17 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10243,8 +11379,8 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -10294,8 +11430,8 @@ else
fi
# PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
ld_shlibs_CXX=yes
case $host_os in
aix3*)
@@ -10407,24 +11543,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -10438,8 +11586,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10469,24 +11619,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -10500,8 +11662,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11232,8 +12396,8 @@ if test -z "$aix_libpath"; then aix_libp
ld_shlibs_CXX=no
;;
esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
@@ -11372,8 +12536,8 @@ lt_prog_compiler_wl_CXX=
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -11646,16 +12810,16 @@ echo $ECHO_N "checking for $compiler opt
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11672,11 +12836,11 @@ else
-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:11675: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12839: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11679: \$? = $ac_status" >&5
+ echo "$as_me:12843: \$? = $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.
@@ -11689,8 +12853,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
@@ -11717,8 +12881,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11745,8 +12909,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
:
@@ -11755,8 +12919,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11776,11 +12940,11 @@ else
-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:11779: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12943: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11783: \$? = $ac_status" >&5
+ echo "$as_me:12947: \$? = $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
@@ -11802,23 +12966,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -11828,8 +12992,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -11853,8 +13017,8 @@ echo $ECHO_N "checking whether the $comp
;;
esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
@@ -11874,8 +13038,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -11912,16 +13076,16 @@ echo $ECHO_N "checking whether -lc shoul
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -12312,7 +13476,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12315 "configure"' > conftest.$ac_ext
+ echo '#line 13479 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12529,8 +13693,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12538,8 +13702,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
@@ -12563,8 +13727,8 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
@@ -13089,13 +14253,13 @@ done
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -13114,15 +14278,15 @@ aix4* | aix5*)
fi
;;
esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
GCC_F77="$G77"
LD_F77="$LD"
@@ -13131,8 +14295,8 @@ lt_prog_compiler_wl_F77=
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
@@ -13341,16 +14505,16 @@ echo $ECHO_N "checking for $compiler opt
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_F77"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13367,11 +14531,11 @@ else
-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:13370: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14534: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13374: \$? = $ac_status" >&5
+ echo "$as_me:14538: \$? = $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.
@@ -13384,8 +14548,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
@@ -13412,8 +14576,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13440,8 +14604,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
if test x"$lt_prog_compiler_static_works_F77" = xyes; then
:
@@ -13450,8 +14614,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13471,11 +14635,11 @@ else
-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:13474: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14638: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13478: \$? = $ac_status" >&5
+ echo "$as_me:14642: \$? = $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
@@ -13497,23 +14661,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -13523,8 +14687,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag_F77=
@@ -13929,24 +15093,36 @@ _LT_EOF
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -13960,8 +15136,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -13980,24 +15158,36 @@ if test -z "$aix_libpath"; then aix_libp
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -14011,8 +15201,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14461,8 +15653,8 @@ if test -z "$aix_libpath"; then aix_libp
esac
fi
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
#
@@ -14482,8 +15674,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14520,16 +15712,16 @@ echo $ECHO_N "checking whether -lc shoul
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -14920,7 +16112,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14923 "configure"' > conftest.$ac_ext
+ echo '#line 16115 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15137,8 +16329,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15146,8 +16338,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
@@ -15171,8 +16363,8 @@ else
# directories.
hardcode_action_F77=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6; }
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
@@ -15609,7 +16801,6 @@ CC="$lt_save_CC"
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
# Source file extension for Java test sources.
ac_ext=java
@@ -15677,8 +16868,8 @@ if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -15695,11 +16886,11 @@ else
-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:15698: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16889: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15702: \$? = $ac_status" >&5
+ echo "$as_me:16893: \$? = $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.
@@ -15712,8 +16903,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -15727,8 +16918,8 @@ lt_prog_compiler_wl_GCJ=
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -15937,16 +17128,16 @@ echo $ECHO_N "checking for $compiler opt
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_GCJ"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -15963,11 +17154,11 @@ else
-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:15966: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15970: \$? = $ac_status" >&5
+ echo "$as_me:17161: \$? = $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.
@@ -15980,8 +17171,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
@@ -16008,8 +17199,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16036,8 +17227,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
:
@@ -16046,8 +17237,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16067,11 +17258,11 @@ else
-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:16070: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17261: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16074: \$? = $ac_status" >&5
+ echo "$as_me:17265: \$? = $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
@@ -16093,23 +17284,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -16119,8 +17310,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag_GCJ=
@@ -16535,24 +17726,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -16566,8 +17769,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -16596,24 +17801,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -16627,8 +17844,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17077,8 +18296,8 @@ if test -z "$aix_libpath"; then aix_libp
esac
fi
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
@@ -17098,8 +18317,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -17136,16 +18355,16 @@ echo $ECHO_N "checking whether -lc shoul
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -17536,7 +18755,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17539 "configure"' > conftest.$ac_ext
+ echo '#line 18758 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17753,8 +18972,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -17762,8 +18981,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
@@ -17787,8 +19006,8 @@ else
# directories.
hardcode_action_GCJ=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
@@ -18224,7 +19443,6 @@ CC="$lt_save_CC"
RC)
-
# Source file extension for RC test sources.
ac_ext=rc
@@ -18767,15 +19985,15 @@ echo "$as_me: error: Automake 1.5 or new
esac
if test -n "0.35.0"; then
- echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
+echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
@@ -18830,8 +20048,8 @@ INTLTOOL_UPDATE='$(top_builddir)/intltoo
# 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
+{ 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
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18846,27 +20064,28 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
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
done
done
+IFS=$as_save_IFS
;;
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
+ { 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
+ { 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;}
@@ -18878,11 +20097,11 @@ echo "$as_me: error: perl 5.x required f
{ (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
+ { 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
+ { 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;}
@@ -18892,8 +20111,8 @@ fi
# Extract the first word of "iconv", so it can be a program name with args.
set dummy iconv; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18908,32 +20127,33 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_ICONV="$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_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
+ { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
+echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -18948,32 +20168,33 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MSGFMT="$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_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
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
+echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "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
+{ 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
@@ -18988,32 +20209,33 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$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
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
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# 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
+{ 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
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19028,29 +20250,30 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_XGETTEXT="$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_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
+ { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Substitute ALL_LINGUAS so we can use it in po/Makefile
@@ -19074,24 +20297,36 @@ extern int _nl_msg_cat_cntr;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19100,10 +20335,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-case $host in
+ case $host in
*-*-solaris*)
- echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19130,53 +20365,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef bind_textdomain_codeset
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char bind_textdomain_codeset ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
choke me
-#else
-char (*f) () = bind_textdomain_codeset;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != bind_textdomain_codeset;
+return bind_textdomain_codeset ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19185,13 +20426,14 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_bind_textdomain_codeset=no
+ ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
if test $ac_cv_func_bind_textdomain_codeset = yes; then
DATADIRNAME=share
else
@@ -19204,7 +20446,8 @@ fi
;;
esac
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -19212,14 +20455,14 @@ fi
- ac_config_commands="$ac_config_commands intltool"
+ac_config_commands="$ac_config_commands intltool"
# Check for headers and functions
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19243,24 +20486,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19269,9 +20524,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -19327,6 +20583,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -19346,18 +20603,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19370,12 +20636,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -19389,18 +20657,19 @@ fi
for ac_header in stdlib.h string.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19411,24 +20680,36 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19437,15 +20718,16 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19454,8 +20736,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -19479,9 +20766,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -19505,25 +20793,24 @@ echo "$as_me: WARNING: $ac_header: s
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview ##
## ---------------------------------------------------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -19539,9 +20826,9 @@ done
for ac_func in memset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -19567,53 +20854,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19622,13 +20915,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -19652,8 +20947,8 @@ GNOME_PRINT_REQUIRED_VERSION=2.8.0
# Pull glib-genmarshal & co.
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19668,31 +20963,32 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_GENMARSHAL="$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
;;
esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
-
if test -n "$GLIB_GENMARSHAL"; then
- echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
-echo "${ECHO_T}$GLIB_GENMARSHAL" >&6
+ { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
+echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "glib-mkenums", so it can be a program name with args.
set dummy glib-mkenums; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19707,28 +21003,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_MKENUMS="$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
;;
esac
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
-
if test -n "$GLIB_MKENUMS"; then
- echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
-echo "${ECHO_T}$GLIB_MKENUMS" >&6
+ { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
+echo "${ECHO_T}$GLIB_MKENUMS" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Environment
@@ -19743,13 +21040,13 @@ fi
if test x$MAINT = x; then
- # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+ # Check whether --enable-compile-warnings was given.
if test "${enable_compile_warnings+set}" = set; then
- enableval="$enable_compile_warnings"
-
+ enableval=$enable_compile_warnings;
else
enable_compile_warnings="error"
-fi;
+fi
+
warnCFLAGS=
if test "x$GCC" != xyes; then
@@ -19775,8 +21072,8 @@ fi;
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19793,24 +21090,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19819,12 +21128,13 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-has_option=no
+ has_option=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
- echo "$as_me:$LINENO: result: $has_option" >&5
-echo "${ECHO_T}$has_option" >&6
+ { echo "$as_me:$LINENO: result: $has_option" >&5
+echo "${ECHO_T}$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
fi
@@ -19843,21 +21153,21 @@ echo "$as_me: error: Unknown argument '$
;;
esac
CFLAGS="$realsave_CFLAGS"
- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $warning_flags" >&5
-echo "${ECHO_T}$warning_flags" >&6
+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $warning_flags" >&5
+echo "${ECHO_T}$warning_flags" >&6; }
- # Check whether --enable-iso-c or --disable-iso-c was given.
+ # Check whether --enable-iso-c was given.
if test "${enable_iso_c+set}" = set; then
- enableval="$enable_iso_c"
-
+ enableval=$enable_iso_c;
else
enable_iso_c=no
-fi;
+fi
+
- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
if test "x$GCC" = "xyes"; then
@@ -19871,8 +21181,8 @@ echo $ECHO_N "checking what language com
esac
fi
fi
- echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-echo "${ECHO_T}$complCFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+echo "${ECHO_T}$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
@@ -19881,13 +21191,13 @@ echo "${ECHO_T}$complCFLAGS" >&6
else
- # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+ # Check whether --enable-compile-warnings was given.
if test "${enable_compile_warnings+set}" = set; then
- enableval="$enable_compile_warnings"
-
+ enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-fi;
+fi
+
warnCFLAGS=
if test "x$GCC" != xyes; then
@@ -19913,8 +21223,8 @@ fi;
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19931,24 +21241,36 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19957,12 +21279,13 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-has_option=no
+ has_option=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
- echo "$as_me:$LINENO: result: $has_option" >&5
-echo "${ECHO_T}$has_option" >&6
+ { echo "$as_me:$LINENO: result: $has_option" >&5
+echo "${ECHO_T}$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
fi
@@ -19981,21 +21304,21 @@ echo "$as_me: error: Unknown argument '$
;;
esac
CFLAGS="$realsave_CFLAGS"
- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $warning_flags" >&5
-echo "${ECHO_T}$warning_flags" >&6
+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $warning_flags" >&5
+echo "${ECHO_T}$warning_flags" >&6; }
- # Check whether --enable-iso-c or --disable-iso-c was given.
+ # Check whether --enable-iso-c was given.
if test "${enable_iso_c+set}" = set; then
- enableval="$enable_iso_c"
-
+ enableval=$enable_iso_c;
else
enable_iso_c=no
-fi;
+fi
- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
if test "x$GCC" = "xyes"; then
@@ -20009,8 +21332,8 @@ echo $ECHO_N "checking what language com
esac
fi
fi
- echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-echo "${ECHO_T}$complCFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+echo "${ECHO_T}$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
@@ -20025,8 +21348,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20041,34 +21364,35 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20083,28 +21407,42 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
if test -n "$ac_pt_PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- PKG_CONFIG=$ac_pt_PKG_CONFIG
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf 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 gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
@@ -20112,22 +21450,22 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
PKG_CONFIG=""
fi
fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for DEP" >&5
-echo $ECHO_N "checking for DEP... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for DEP" >&5
+echo $ECHO_N "checking for DEP... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$DEP_CFLAGS"; then
@@ -20241,18 +21579,17 @@ See \`config.log' for more details." >&2
else
DEP_CFLAGS=$pkg_cv_DEP_CFLAGS
DEP_LIBS=$pkg_cv_DEP_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
:
fi
# Check for gnomeprint support
-# Check whether --enable-gnomeprint or --disable-gnomeprint was given.
+# Check whether --enable-gnomeprint was given.
if test "${enable_gnomeprint+set}" = set; then
- enableval="$enable_gnomeprint"
- case "${enableval}" in
+ enableval=$enable_gnomeprint; case "${enableval}" in
yes) enable_gnomeprint=true ;;
no) enable_gnomeprint=false ;;
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-gnomeprint" >&5
@@ -20261,7 +21598,8 @@ echo "$as_me: error: bad value ${enablev
esac
else
enable_gnomeprint=true
-fi;
+fi
+
msg_gnomeprint=no
@@ -20277,8 +21615,8 @@ fi
if test "$enable_gnomeprint" = "true"; then
pkg_failed=no
-echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5
-echo $ECHO_N "checking for GNOMEPRINT... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5
+echo $ECHO_N "checking for GNOMEPRINT... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$GNOMEPRINT_CFLAGS"; then
@@ -20358,8 +21696,8 @@ fi
else
GNOMEPRINT_CFLAGS=$pkg_cv_GNOMEPRINT_CFLAGS
GNOMEPRINT_LIBS=$pkg_cv_GNOMEPRINT_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
if true; then
@@ -20392,9 +21730,9 @@ BUILD_GNU_REGEX=false
for ac_func in re_compile_pattern re_compile_fastmap re_search re_match
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -20420,53 +21758,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -20475,13 +21819,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -20511,10 +21857,9 @@ fi
# Do we build optional tests? (they require gnome-vfs and gnomeprintui support)
-# Check whether --enable-build_tests or --disable-build_tests was given.
+# Check whether --enable-build_tests was given.
if test "${enable_build_tests+set}" = set; then
- enableval="$enable_build_tests"
- case "${enableval}" in
+ enableval=$enable_build_tests; case "${enableval}" in
yes) build_tests=true ;;
no) build_tests=false ;;
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-build-tests" >&5
@@ -20523,7 +21868,8 @@ echo "$as_me: error: bad value ${enablev
esac
else
build_tests=true
-fi;
+fi
+
# disable tests if gnomeprint is not enabled
if test x$msg_gnomeprint != xyes; then
@@ -20545,8 +21891,8 @@ fi
if test x$build_tests = xtrue; then
pkg_failed=no
-echo "$as_me:$LINENO: checking for TESTS" >&5
-echo $ECHO_N "checking for TESTS... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for TESTS" >&5
+echo $ECHO_N "checking for TESTS... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$TESTS_CFLAGS"; then
@@ -20634,8 +21980,8 @@ fi
else
TESTS_CFLAGS=$pkg_cv_TESTS_CFLAGS
TESTS_LIBS=$pkg_cv_TESTS_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
if true; then
@@ -20671,18 +22017,19 @@ _ACEOF
for ac_header in locale.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20693,24 +22040,36 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -20719,15 +22078,16 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20736,8 +22096,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -20761,9 +22126,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -20787,25 +22153,24 @@ echo "$as_me: WARNING: $ac_header: s
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview ##
## ---------------------------------------------------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -20818,8 +22183,8 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20839,24 +22204,36 @@ return LC_MESSAGES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -20865,13 +22242,14 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-am_cv_val_LC_MESSAGES=no
+ am_cv_val_LC_MESSAGES=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -20880,7 +22258,7 @@ _ACEOF
fi
fi
- USE_NLS=yes
+ USE_NLS=yes
gt_cv_have_gettext=no
@@ -20890,17 +22268,17 @@ _ACEOF
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
- echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libintl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20911,24 +22289,36 @@ $ac_includes_default
#include <libintl.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -20937,15 +22327,16 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20954,8 +22345,13 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libintl.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -20979,9 +22375,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
+
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -21005,25 +22402,23 @@ echo "$as_me: WARNING: libintl.h: se
echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview ##
## ---------------------------------------------------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libintl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_libintl_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
fi
if test $ac_cv_header_libintl_h = yes; then
@@ -21033,8 +22428,8 @@ if test $ac_cv_header_libintl_h = yes; t
#
# First check in libc
#
- echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
if test "${gt_cv_func_ngettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21056,24 +22451,36 @@ return !ngettext ("","", 1)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21082,18 +22489,19 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gt_cv_func_ngettext_libc=no
+ gt_cv_func_ngettext_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
if test "${gt_cv_func_dgettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21115,24 +22523,36 @@ return !dgettext ("","")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21141,14 +22561,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gt_cv_func_dgettext_libc=no
+ gt_cv_func_dgettext_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
fi
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
@@ -21156,9 +22577,9 @@ echo "${ECHO_T}$gt_cv_func_dgettext_libc
for ac_func in bind_textdomain_codeset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -21184,53 +22605,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21239,13 +22666,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -21263,8 +22692,8 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21277,40 +22706,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char bindtextdomain ();
int
main ()
{
-bindtextdomain ();
+return bindtextdomain ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21319,17 +22760,18 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_bindtextdomain=no
+ ac_cv_lib_intl_bindtextdomain=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
if test $ac_cv_lib_intl_bindtextdomain = yes; then
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21342,40 +22784,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21384,17 +22838,18 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
if test $ac_cv_lib_intl_ngettext = yes; then
- echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_dgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21407,40 +22862,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dgettext ();
int
main ()
{
-dgettext ();
+return dgettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21449,14 +22916,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_dgettext=no
+ ac_cv_lib_intl_dgettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
@@ -21467,12 +22935,12 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6; }
+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21485,40 +22953,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21527,17 +23007,18 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
if test $ac_cv_lib_intl_ngettext = yes; then
- echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21550,40 +23031,52 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dcgettext ();
int
main ()
{
-dcgettext ();
+return dcgettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21592,14 +23085,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_dcgettext=no
+ ac_cv_lib_intl_dcgettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
@@ -21626,9 +23120,9 @@ fi
for ac_func in bind_textdomain_codeset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -21654,53 +23148,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21709,13 +23209,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -21754,8 +23256,8 @@ _ACEOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21781,11 +23283,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
- echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
@@ -21794,9 +23296,9 @@ fi
for ac_func in dcgettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -21822,53 +23324,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -21877,13 +23385,15 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -21894,8 +23404,8 @@ done
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21910,32 +23420,33 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
-
if test -n "$GMSGFMT"; then
- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# 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
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21961,11 +23472,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
cat >conftest.$ac_ext <<_ACEOF
@@ -21985,24 +23496,36 @@ extern int _nl_msg_cat_cntr;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -22012,10 +23535,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-case $host in
+ case $host in
*-*-solaris*)
- echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22042,53 +23565,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef bind_textdomain_codeset
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
-{
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char bind_textdomain_codeset ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
choke me
-#else
-char (*f) () = bind_textdomain_codeset;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != bind_textdomain_codeset;
+return bind_textdomain_codeset ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -22097,13 +23626,14 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_bind_textdomain_codeset=no
+ ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
if test $ac_cv_func_bind_textdomain_codeset = yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
@@ -22119,7 +23649,8 @@ fi
;;
esac
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
@@ -22144,8 +23675,8 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
fi
@@ -22153,7 +23684,7 @@ echo "${ECHO_T}found xgettext program is
# We need to process the po/ directory.
POSUB=po
- ac_config_commands="$ac_config_commands default-1"
+ ac_config_commands="$ac_config_commands default-1"
for lang in $ALL_LINGUAS; do
@@ -22177,8 +23708,8 @@ echo "${ECHO_T}found xgettext program is
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
@@ -22202,8 +23733,8 @@ echo $ECHO_N "checking for catalogs to b
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
+echo "${ECHO_T}$LINGUAS" >&6; }
fi
if test -n "$LINGUAS"; then
@@ -22258,31 +23789,31 @@ _ACEOF
# gtk-doc
-# Check whether --with-html-dir or --without-html-dir was given.
+# Check whether --with-html-dir was given.
if test "${with_html_dir+set}" = set; then
- withval="$with_html_dir"
-
+ withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-fi;
+fi
+
HTML_DIR="$with_html_dir"
- # Check whether --enable-gtk-doc or --disable-gtk-doc was given.
+ # Check whether --enable-gtk-doc was given.
if test "${enable_gtk_doc+set}" = set; then
- enableval="$enable_gtk_doc"
-
+ enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-fi;
+fi
+
have_gtk_doc=no
if test x$enable_gtk_doc = xyes; then
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22297,28 +23828,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
have_gtk_doc=yes
@@ -22326,14 +23858,14 @@ fi
gtk_doc_min_version=1.0
if test "$have_gtk_doc" = yes; then
- echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5
-echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5
+echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; }
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
have_gtk_doc=no
fi
fi
@@ -22366,7 +23898,7 @@ fi
# Output files
- ac_config_files="$ac_config_files gtksourceview-1.0.pc Makefile gtksourceview-zip po/Makefile.in gtksourceview/Makefile gtksourceview/gnu-regex/Makefile gtksourceview/language-specs/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml tests/Makefile"
+ac_config_files="$ac_config_files gtksourceview-1.0.pc Makefile gtksourceview-zip po/Makefile.in gtksourceview/Makefile gtksourceview/gnu-regex/Makefile gtksourceview/language-specs/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml tests/Makefile"
cat >confcache <<\_ACEOF
@@ -22387,39 +23919,58 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+
(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-} |
+ esac |
+ sort
+) |
sed '
+ /^ac_cv_env_/b end
t clear
- : clear
+ :clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- echo "not updating unwritable cache $cache_file"
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -22428,32 +23979,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:* srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -22489,7 +24026,7 @@ Usually this means the macro was only in
{ (exit 1); exit 1; }; }
fi
- ac_config_commands="$ac_config_commands po/stamp-it"
+ ac_config_commands="$ac_config_commands po/stamp-it"
if test -z "${HAVE_GNOMEPRINT_TRUE}" && test -z "${HAVE_GNOMEPRINT_FALSE}"; then
@@ -22600,11 +24137,35 @@ if test -n "${ZSH_VERSION+set}" && (emul
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
@@ -22613,8 +24174,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -22628,18 +24224,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- $as_unset $as_var
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -22647,159 +24244,120 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
+# CDPATH.
+$as_unset CDPATH
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -22808,7 +24366,19 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+# Find out whether ``test -x'' works. Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ as_executable_p="test -x"
+else
+ as_executable_p=:
+fi
+rm -f conf$$.file
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -22817,31 +24387,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
exec 6>&1
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by gtksourceview $as_me 1.8.2, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by gtksourceview $as_me 1.8.3, which was
+generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -22849,30 +24402,20 @@ generated by GNU Autoconf 2.59. Invocat
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
@@ -22899,19 +24442,21 @@ Configuration commands:
$config_commands
Report bugs to <bug-autoconf gnu org>."
-_ACEOF
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-gtksourceview config.status 1.8.2
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+gtksourceview config.status 1.8.3
+configured by $0, generated by GNU Autoconf 2.60,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22922,39 +24467,24 @@ while test $# != 0
do
case $1 in
--*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
+ *)
ac_option=$1
ac_optarg=$2
ac_shift=shift
;;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_option=$1
- ac_need_defaults=false;;
esac
case $ac_option in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
@@ -22964,18 +24494,24 @@ Try \`$0 --help' for more information."
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+ -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
+ *) ac_config_targets="$ac_config_targets $1"
+ ac_need_defaults=false ;;
esac
shift
@@ -22991,17 +24527,28 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ echo "$ac_log"
+} >&5
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
#
-# INIT-COMMANDS section.
+# INIT-COMMANDS
#
-
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -23012,35 +24559,36 @@ INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
_ACEOF
-
-
cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "gtksourceview-1.0.pc" ) CONFIG_FILES="$CONFIG_FILES gtksourceview-1.0.pc" ;;
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "gtksourceview-zip" ) CONFIG_FILES="$CONFIG_FILES gtksourceview-zip" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "gtksourceview/Makefile" ) CONFIG_FILES="$CONFIG_FILES gtksourceview/Makefile" ;;
- "gtksourceview/gnu-regex/Makefile" ) CONFIG_FILES="$CONFIG_FILES gtksourceview/gnu-regex/Makefile" ;;
- "gtksourceview/language-specs/Makefile" ) CONFIG_FILES="$CONFIG_FILES gtksourceview/language-specs/Makefile" ;;
- "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
- "docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
- "docs/reference/version.xml" ) CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
- "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "gtksourceview-1.0.pc") CONFIG_FILES="$CONFIG_FILES gtksourceview-1.0.pc" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "gtksourceview-zip") CONFIG_FILES="$CONFIG_FILES gtksourceview-zip" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "gtksourceview/Makefile") CONFIG_FILES="$CONFIG_FILES gtksourceview/Makefile" ;;
+ "gtksourceview/gnu-regex/Makefile") CONFIG_FILES="$CONFIG_FILES gtksourceview/gnu-regex/Makefile" ;;
+ "gtksourceview/language-specs/Makefile") CONFIG_FILES="$CONFIG_FILES gtksourceview/language-specs/Makefile" ;;
+ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+ "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
+ "docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
+
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
@@ -23052,674 +24600,661 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ tmp=
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
-
# Create a (secure) tmp directory for tmp files.
{
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
} ||
{
echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
#
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
#
# No need to generate the scripts if there are no CONFIG_FILES.
# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@ACLOCAL_AMFLAGS@,$ACLOCAL_AMFLAGS,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
-s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
-s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t
-s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t
-s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t
-s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t
-s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t
-s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t
-s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t
-s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
-s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
-s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
-s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
-s,@INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t
-s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
-s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
-s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
-s,@INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t
-s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
-s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
-s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
-s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t
-s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
-s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
-s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
-s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
-s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@GTK_REQUIRED_VERSION@,$GTK_REQUIRED_VERSION,;t t
-s,@GNOME_VFS_REQUIRED_VERSION@,$GNOME_VFS_REQUIRED_VERSION,;t t
-s,@LIBXML_REQUIRED_VERSION@,$LIBXML_REQUIRED_VERSION,;t t
-s,@GNOME_PRINT_REQUIRED_VERSION@,$GNOME_PRINT_REQUIRED_VERSION,;t t
-s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t
-s,@GLIB_MKENUMS@,$GLIB_MKENUMS,;t t
-s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-s,@DEPRECATED_FLAGS@,$DEPRECATED_FLAGS,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@DEP_CFLAGS@,$DEP_CFLAGS,;t t
-s,@DEP_LIBS@,$DEP_LIBS,;t t
-s,@HAVE_GNOMEPRINT_TRUE@,$HAVE_GNOMEPRINT_TRUE,;t t
-s,@HAVE_GNOMEPRINT_FALSE@,$HAVE_GNOMEPRINT_FALSE,;t t
-s,@GNOMEPRINT_CFLAGS@,$GNOMEPRINT_CFLAGS,;t t
-s,@GNOMEPRINT_LIBS@,$GNOMEPRINT_LIBS,;t t
-s,@BUILD_GNU_REGEX_TRUE@,$BUILD_GNU_REGEX_TRUE,;t t
-s,@BUILD_GNU_REGEX_FALSE@,$BUILD_GNU_REGEX_FALSE,;t t
-s,@BUILD_TESTS_TRUE@,$BUILD_TESTS_TRUE,;t t
-s,@BUILD_TESTS_FALSE@,$BUILD_TESTS_FALSE,;t t
-s,@TESTS_CFLAGS@,$TESTS_CFLAGS,;t t
-s,@TESTS_LIBS@,$TESTS_LIBS,;t t
-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
-s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
-s,@POFILES@,$POFILES,;t t
-s,@POSUB@,$POSUB,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@HTML_DIR@,$HTML_DIR,;t t
-s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t
-s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t
-s,@GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t
-s,@GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
+INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
+INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
+INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+DATADIRNAME!$DATADIRNAME$ac_delim
+GTK_REQUIRED_VERSION!$GTK_REQUIRED_VERSION$ac_delim
+GNOME_VFS_REQUIRED_VERSION!$GNOME_VFS_REQUIRED_VERSION$ac_delim
+LIBXML_REQUIRED_VERSION!$LIBXML_REQUIRED_VERSION$ac_delim
+GNOME_PRINT_REQUIRED_VERSION!$GNOME_PRINT_REQUIRED_VERSION$ac_delim
+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
+WARN_CFLAGS!$WARN_CFLAGS$ac_delim
+DEPRECATED_FLAGS!$DEPRECATED_FLAGS$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+DEP_CFLAGS!$DEP_CFLAGS$ac_delim
+DEP_LIBS!$DEP_LIBS$ac_delim
+HAVE_GNOMEPRINT_TRUE!$HAVE_GNOMEPRINT_TRUE$ac_delim
+HAVE_GNOMEPRINT_FALSE!$HAVE_GNOMEPRINT_FALSE$ac_delim
+GNOMEPRINT_CFLAGS!$GNOMEPRINT_CFLAGS$ac_delim
+GNOMEPRINT_LIBS!$GNOMEPRINT_LIBS$ac_delim
+BUILD_GNU_REGEX_TRUE!$BUILD_GNU_REGEX_TRUE$ac_delim
+BUILD_GNU_REGEX_FALSE!$BUILD_GNU_REGEX_FALSE$ac_delim
+BUILD_TESTS_TRUE!$BUILD_TESTS_TRUE$ac_delim
+BUILD_TESTS_FALSE!$BUILD_TESTS_FALSE$ac_delim
+TESTS_CFLAGS!$TESTS_CFLAGS$ac_delim
+TESTS_LIBS!$TESTS_LIBS$ac_delim
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+INSTOBJEXT!$INSTOBJEXT$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+POFILES!$POFILES$ac_delim
+POSUB!$POSUB$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+HTML_DIR!$HTML_DIR$ac_delim
+ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
+ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
+GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
+GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:* srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
+
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ ac_file_inputs="$ac_file_inputs $ac_f"
+ done
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ fi
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
+ esac
+
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
-
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
case $INSTALL in
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+_ACEOF
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- configure_input=
- else
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+* datadir@*|* docdir@*|* infodir@*|* localedir@*|* mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+ rm -f "$tmp/stdin"
case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
-
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- # Do quote $f, to prevent DOS paths from being IFS'd.
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
_ACEOF
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h. The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status. Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless. Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
-# This sed command replaces #undef with comments. This is necessary, for
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo ' :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
+while :
do
- # Write a limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
echo 'CEOF
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
rm -f conftest.defines
mv conftest.tail conftest.defines
done
-rm -f conftest.defines
-echo ' fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
cat >>$CONFIG_STATUS <<\_ACEOF
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- echo "/* Generated by configure. */" >$tmp/config.h
- else
- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
- fi
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
if test x"$ac_file" != x-; then
- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
rm -f $ac_file
- mv $tmp/config.h $ac_file
+ mv "$tmp/config.h" $ac_file
fi
else
- cat $tmp/config.h
- rm -f $tmp/config.h
+ echo "/* $configure_input */"
+ cat "$ac_result"
fi
+ rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
@@ -23730,135 +25265,39 @@ for _am_header in $config_headers :; do
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X$ac_file : 'X\(//\)[^/]' \| \
X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
- ac_builddir=.
-
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
- case $ac_dest in
- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
@@ -23868,18 +25307,29 @@ echo "$as_me: executing $ac_dest command
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`(dirname "$mf") 2>/dev/null ||
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
else
continue
fi
@@ -23901,49 +25351,76 @@ echo X"$mf" |
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
- fdir=`(dirname "$file") 2>/dev/null ||
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p $dirpart/$fdir
- else
- as_dir=$dirpart/$fdir
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
-
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
;;
- intltool )
+ "intltool":C)
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
@@ -23964,10 +25441,10 @@ for file in intltool-extract intltool-me
done
;;
- default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
- po/stamp-it )
+ "po/stamp-it":C)
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
sed '/^#/d
@@ -23990,11 +25467,10 @@ echo "$as_me: error: po/Makefile is not
rm -f "po/Makefile.tmp"
mv "po/stamp-it.tmp" "po/stamp-it"
;;
+
esac
-done
-_ACEOF
+done # for ac_tag
-cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
_ACEOF
diff -pruN 1.8.2-1/configure.in 1.8.3-0ubuntu1/configure.in
--- 1.8.2-1/configure.in 2006-12-13 12:01:28.000000000 +0000
+++ 1.8.3-0ubuntu1/configure.in 2007-01-08 19:41:19.000000000 +0000
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to p
AC_PREREQ(2.53)
# Initialization and versioning
-AC_INIT(gtksourceview, 1.8.2, http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview)
+AC_INIT(gtksourceview, 1.8.3, http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview)
AC_CONFIG_SRCDIR([gtksourceview/gtksourcebuffer.h])
AM_CONFIG_HEADER(config.h)
diff -pruN 1.8.2-1/debian/changelog 1.8.3-0ubuntu1/debian/changelog
--- 1.8.2-1/debian/changelog 2007-01-08 23:15:19.000000000 +0000
+++ 1.8.3-0ubuntu1/debian/changelog 2007-01-08 23:12:37.000000000 +0000
@@ -1,3 +1,17 @@
+gtksourceview (1.8.3-0ubuntu1) feisty; urgency=low
+
+ * New upstream version:
+ - Added docbook lang file
+ - Added OCaml lang file
+ - Cleanup some mime types in lang files
+ - Updated translations
+ * debian/libgtksourceview-common.install:
+ - don't install ocaml.lang, the new version ship it
+ * debian/ocaml.lang:
+ - dropped, the new upstream version ship it
+
+ -- Sebastien Bacher <seb128 canonical com> Mon, 8 Jan 2007 21:21:03 +0100
+
gtksourceview (1.8.2-1) unstable; urgency=medium
* New upstream stable release with new translations (ar, ne), translation
diff -pruN 1.8.2-1/debian/libgtksourceview-common.install 1.8.3-0ubuntu1/debian/libgtksourceview-common.install
--- 1.8.2-1/debian/libgtksourceview-common.install 2007-01-08 23:15:19.000000000 +0000
+++ 1.8.3-0ubuntu1/debian/libgtksourceview-common.install 2007-01-08 23:12:37.000000000 +0000
@@ -1,3 +1,2 @@
debian/tmp/usr/share/gtksourceview-1.0
debian/tmp/usr/share/locale
-debian/ocaml.lang /usr/share/gtksourceview-1.0/language-specs
diff -pruN 1.8.2-1/debian/ocaml.lang 1.8.3-0ubuntu1/debian/ocaml.lang
--- 1.8.2-1/debian/ocaml.lang 2007-01-08 23:15:19.000000000 +0000
+++ 1.8.3-0ubuntu1/debian/ocaml.lang 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Objective Caml" version="1.0" _section="Sources" mimetypes="text/x-ocaml">
-
- <escape-char>\</escape-char>
-
- <block-comment _name = "Comment" style= "Comment" end-at-line-end = "FALSE">
- <start-regex>\(\*</start-regex>
- <end-regex>\*\)</end-regex>
- </block-comment>
-
- <pattern-item _name = "Decimal" style = "Decimal">
- <regex>\b[-]?[0-9][0-9_]*[lL]?\b</regex>
- </pattern-item>
-
- <pattern-item _name = "Hex Number" style = "Base-N Integer">
- <regex>\b[-]?0[xX][0-9A-Fa-f][0-9A-Fa-f_]*[lL]?\b</regex>
- </pattern-item>
-
- <pattern-item _name = "Octal Number" style = "Base-N Integer">
- <regex>\b[-]?0[oO][0-7][0-7_]*[lL]?\b</regex>
- </pattern-item>
-
- <pattern-item _name = "Binary Number" style = "Base-N Integer">
- <regex>\b[-]?0[bB][01][01_]*[lL]?\b</regex>
- </pattern-item>
-
- <pattern-item _name = "Floating Point Number" style = "Floating Point">
- <regex>\b[-]?[0-9][0-9_]*(\.[0-9_]*)?([Ee][+-]?[0-9][0-9_]*)?</regex>
- </pattern-item>
-
- <string _name = "Character Constant" style = "String" end-at-line-end = "TRUE">
- <start-regex>'</start-regex>
- <end-regex>'</end-regex>
- </string>
-
- <string _name = "String" style = "String" end-at-line-end = "FALSE">
- <start-regex>"</start-regex>
- <end-regex>"</end-regex>
- </string>
-
- <keyword-list _name = "Boolean Constant" style = "String" case-sensitive="FALSE">
- <keyword>true</keyword>
- <keyword>false</keyword>
- </keyword-list>
-
- <pattern-item _name = "Modules" style = "Data Type" case-sensitive="TRUE">
- <regex>\b[A-Z][A-Za-z0-9_']*</regex>
- </pattern-item>
-
- <pattern-item _name = "Labels" style = "Data Type" case-sensitive="TRUE">
- <regex>[~?][a-z][A-Za-z0-9_']*</regex>
- </pattern-item>
-
- <keyword-list _name = "Keywords" style = "Keyword" case-sensitive="TRUE">
- <keyword>asm</keyword>
- <keyword>break</keyword>
- <keyword>case</keyword>
- <keyword>continue</keyword>
- <keyword>default</keyword>
- <keyword>do</keyword>
- <keyword>else</keyword>
- <keyword>for</keyword>
- <keyword>fortran</keyword>
- <keyword>goto</keyword>
- <keyword>if</keyword>
- <keyword>return</keyword>
- <keyword>sizeof</keyword>
- <keyword>switch</keyword>
- <keyword>while</keyword>
- <keyword>and</keyword>
- <keyword>as</keyword>
- <keyword>assert</keyword>
- <keyword>asr</keyword>
- <keyword>begin</keyword>
- <keyword>class</keyword>
- <keyword>constraint</keyword>
- <keyword>do</keyword>
- <keyword>done</keyword>
- <keyword>downto</keyword>
- <keyword>else</keyword>
- <keyword>end</keyword>
- <keyword>exception</keyword>
- <keyword>external</keyword>
- <keyword>for</keyword>
- <keyword>fun</keyword>
- <keyword>function</keyword>
- <keyword>functor</keyword>
- <keyword>if</keyword>
- <keyword>in</keyword>
- <keyword>include</keyword>
- <keyword>inherit</keyword>
- <keyword>initializer</keyword>
- <keyword>land</keyword>
- <keyword>lazy</keyword>
- <keyword>let</keyword>
- <keyword>lor</keyword>
- <keyword>lsl</keyword>
- <keyword>lsr</keyword>
- <keyword>lxor</keyword>
- <keyword>match</keyword>
- <keyword>method</keyword>
- <keyword>mod</keyword>
- <keyword>module</keyword>
- <keyword>mutable</keyword>
- <keyword>new</keyword>
- <keyword>object</keyword>
- <keyword>of</keyword>
- <keyword>open</keyword>
- <keyword>or</keyword>
- <keyword>private</keyword>
- <keyword>rec</keyword>
- <keyword>sig</keyword>
- <keyword>struct</keyword>
- <keyword>then</keyword>
- <keyword>to</keyword>
- <keyword>try</keyword>
- <keyword>type</keyword>
- <keyword>val</keyword>
- <keyword>virtual</keyword>
- <keyword>when</keyword>
- <keyword>while</keyword>
- <keyword>with</keyword>
- </keyword-list>
-</language>
diff -pruN 1.8.2-1/docs/Makefile.in 1.8.3-0ubuntu1/docs/Makefile.in
--- 1.8.2-1/docs/Makefile.in 2006-12-13 12:03:10.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/Makefile.in 2007-01-08 19:49:15.000000000 +0000
@@ -108,6 +108,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -182,13 +183,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -205,23 +202,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceBuffer.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceBuffer.html
--- 1.8.2-1/docs/reference/html/GtkSourceBuffer.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceBuffer.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceBuffer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="rn01.html" title="API reference">
@@ -21,22 +21,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="gtksourceview-Searching-in-a-GtkSourceBuffer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2538352" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2565533" class="shortcut">Top</a>
 | 
- <a href="#id2568794" class="shortcut">Description</a>
+ <a href="#id2594157" class="shortcut">Description</a>
 | 
- <a href="#id2476881" class="shortcut">Object Hierarchy</a>
+ <a href="#id2502253" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2476912" class="shortcut">Properties</a>
+ <a href="#id2502283" class="shortcut">Properties</a>
 | 
- <a href="#id2476993" class="shortcut">Signals</a></nobr></td></tr>
+ <a href="#id2502364" class="shortcut">Signals</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceBuffer"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2538352"></a><span class="refentrytitle">GtkSourceBuffer</span>
+<a name="id2565533"></a><span class="refentrytitle">GtkSourceBuffer</span>
</h2>
<p>GtkSourceBuffer — Text buffer object for <a href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a></p>
</td>
@@ -121,7 +121,7 @@ void <a href="GtkSourceBuffer.htm
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2476881"></a><h2>Object Hierarchy</h2>
+<a name="id2502253"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -130,7 +130,7 @@ void <a href="GtkSourceBuffer.htm
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2476912"></a><h2>Properties</h2>
+<a name="id2502283"></a><h2>Properties</h2>
<pre class="synopsis">
"<a href="GtkSourceBuffer.html#GtkSourceBuffer--check-brackets">check-brackets</a>" gboolean : Read / Write
@@ -141,7 +141,7 @@ void <a href="GtkSourceBuffer.htm
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2476993"></a><h2>Signals</h2>
+<a name="id2502364"></a><h2>Signals</h2>
<pre class="synopsis">
"<a href="GtkSourceBuffer.html#GtkSourceBuffer-can-redo">can-redo</a>" void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
@@ -162,7 +162,7 @@ void <a href="GtkSourceBuffer.htm
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2568794"></a><h2>Description</h2>
+<a name="id2594157"></a><h2>Description</h2>
<p>
The <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> object is the model for <a href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a> widgets.
It extends the <span class="type">GtkTextBuffer</span> object by adding features necessary to
@@ -184,20 +184,20 @@ tag table.
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2568903"></a><h2>Details</h2>
+<a name="id2594267"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2568914"></a><h3>
+<a name="id2594278"></a><h3>
<a name="GtkSourceBuffer-struct"></a>GtkSourceBuffer</h3>
-<a class="indexterm" name="id2568925"></a><pre class="programlisting">typedef struct _GtkSourceBuffer GtkSourceBuffer;</pre>
+<a class="indexterm" name="id2594289"></a><pre class="programlisting">typedef struct _GtkSourceBuffer GtkSourceBuffer;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2568942"></a><h3>
+<a name="id2594306"></a><h3>
<a name="gtk-source-buffer-new"></a>gtk_source_buffer_new ()</h3>
-<a class="indexterm" name="id2568953"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table);</pre>
+<a class="indexterm" name="id2594317"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table);</pre>
<p>
Creates a new source buffer.</p>
<p>
@@ -208,7 +208,9 @@ Creates a new source buffer.</p>
<tbody>
<tr>
<td><span class="term"><em class="parameter"><code>table</code></em> :</span></td>
-<td> a <a href="GtkSourceTagTable.html" title="GtkSourceTagTable"><span class="type">GtkSourceTagTable</span></a>, or <code class="literal">NULL</code> to create a new one.
+<td> a <a href="GtkSourceTagTable.html" title="GtkSourceTagTable"><span class="type">GtkSourceTagTable</span></a>, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> to create a new one.
</td>
</tr>
<tr>
@@ -221,9 +223,9 @@ Creates a new source buffer.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569030"></a><h3>
+<a name="id2594394"></a><h3>
<a name="gtk-source-buffer-new-with-language"></a>gtk_source_buffer_new_with_language ()</h3>
-<a class="indexterm" name="id2569044"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new_with_language
+<a class="indexterm" name="id2594408"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_buffer_new_with_language
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Creates a new source buffer using the highlighting patterns in
@@ -252,9 +254,9 @@ according to <em class="parameter"><code
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569138"></a><h3>
+<a name="id2594502"></a><h3>
<a name="gtk-source-buffer-get-check-brackets"></a>gtk_source_buffer_get_check_brackets ()</h3>
-<a class="indexterm" name="id2569151"></a><pre class="programlisting">gboolean gtk_source_buffer_get_check_brackets
+<a class="indexterm" name="id2594515"></a><pre class="programlisting">gboolean gtk_source_buffer_get_check_brackets
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether bracket match highlighting is activated for the
@@ -281,9 +283,9 @@ brackets.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569232"></a><h3>
+<a name="id2594596"></a><h3>
<a name="gtk-source-buffer-set-check-brackets"></a>gtk_source_buffer_set_check_brackets ()</h3>
-<a class="indexterm" name="id2569245"></a><pre class="programlisting">void gtk_source_buffer_set_check_brackets
+<a class="indexterm" name="id2594609"></a><pre class="programlisting">void gtk_source_buffer_set_check_brackets
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gboolean check_brackets);</pre>
<p>
@@ -314,9 +316,9 @@ function.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569350"></a><h3>
+<a name="id2594714"></a><h3>
<a name="gtk-source-buffer-set-bracket-match-style"></a>gtk_source_buffer_set_bracket_match_style ()</h3>
-<a class="indexterm" name="id2569364"></a><pre class="programlisting">void gtk_source_buffer_set_bracket_match_style
+<a class="indexterm" name="id2594728"></a><pre class="programlisting">void gtk_source_buffer_set_bracket_match_style
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *source_buffer,
const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
@@ -343,9 +345,9 @@ attributes.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569453"></a><h3>
+<a name="id2594817"></a><h3>
<a name="gtk-source-buffer-get-highlight"></a>gtk_source_buffer_get_highlight ()</h3>
-<a class="indexterm" name="id2569466"></a><pre class="programlisting">gboolean gtk_source_buffer_get_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2594830"></a><pre class="programlisting">gboolean gtk_source_buffer_get_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether text highlighting is activated in the source
buffer.</p>
@@ -370,9 +372,9 @@ buffer.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569545"></a><h3>
+<a name="id2594909"></a><h3>
<a name="gtk-source-buffer-set-highlight"></a>gtk_source_buffer_set_highlight ()</h3>
-<a class="indexterm" name="id2569558"></a><pre class="programlisting">void gtk_source_buffer_set_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2594922"></a><pre class="programlisting">void gtk_source_buffer_set_highlight (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gboolean highlight);</pre>
<p>
Controls whether text is highlighted in the buffer. If <em class="parameter"><code>highlight</code></em>
@@ -414,9 +416,9 @@ and enable it when finished.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569724"></a><h3>
+<a name="id2595088"></a><h3>
<a name="gtk-source-buffer-get-max-undo-levels"></a>gtk_source_buffer_get_max_undo_levels ()</h3>
-<a class="indexterm" name="id2569738"></a><pre class="programlisting">gint gtk_source_buffer_get_max_undo_levels
+<a class="indexterm" name="id2595102"></a><pre class="programlisting">gint gtk_source_buffer_get_max_undo_levels
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines the number of undo levels the buffer will track for
@@ -442,9 +444,9 @@ buffer edits.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569809"></a><h3>
+<a name="id2595173"></a><h3>
<a name="gtk-source-buffer-set-max-undo-levels"></a>gtk_source_buffer_set_max_undo_levels ()</h3>
-<a class="indexterm" name="id2569822"></a><pre class="programlisting">void gtk_source_buffer_set_max_undo_levels
+<a class="indexterm" name="id2595186"></a><pre class="programlisting">void gtk_source_buffer_set_max_undo_levels
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gint max_undo_levels);</pre>
<p>
@@ -480,9 +482,9 @@ But, inserting a newline does start a ne
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2569925"></a><h3>
+<a name="id2595289"></a><h3>
<a name="gtk-source-buffer-get-language"></a>gtk_source_buffer_get_language ()</h3>
-<a class="indexterm" name="id2569938"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_buffer_get_language
+<a class="indexterm" name="id2595302"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_buffer_get_language
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines the <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> used by the buffer. The returned
@@ -501,7 +503,9 @@ object should not be unreferenced by the
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
<td> the <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> set by
-<a href="GtkSourceBuffer.html#gtk-source-buffer-set-language"><code class="function">gtk_source_buffer_set_language()</code></a>, or <code class="literal">NULL</code>.
+<a href="GtkSourceBuffer.html#gtk-source-buffer-set-language"><code class="function">gtk_source_buffer_set_language()</code></a>, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -509,9 +513,9 @@ object should not be unreferenced by the
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570042"></a><h3>
+<a name="id2595406"></a><h3>
<a name="gtk-source-buffer-set-language"></a>gtk_source_buffer_set_language ()</h3>
-<a class="indexterm" name="id2570056"></a><pre class="programlisting">void gtk_source_buffer_set_language (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2595420"></a><pre class="programlisting">void gtk_source_buffer_set_language (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Sets the <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> the source buffer will use, adding
@@ -533,7 +537,9 @@ set.</p>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>language</code></em> :</span></td>
-<td> a <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> to set, or <code class="literal">NULL</code>.
+<td> a <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a> to set, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -541,9 +547,9 @@ set.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570193"></a><h3>
+<a name="id2595535"></a><h3>
<a name="gtk-source-buffer-get-escape-char"></a>gtk_source_buffer_get_escape_char ()</h3>
-<a class="indexterm" name="id2570207"></a><pre class="programlisting">gunichar gtk_source_buffer_get_escape_char
+<a class="indexterm" name="id2595548"></a><pre class="programlisting">gunichar gtk_source_buffer_get_escape_char
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines the escaping character used by the source buffer
@@ -570,9 +576,9 @@ buffer is using.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570277"></a><h3>
+<a name="id2595611"></a><h3>
<a name="gtk-source-buffer-set-escape-char"></a>gtk_source_buffer_set_escape_char ()</h3>
-<a class="indexterm" name="id2570291"></a><pre class="programlisting">void gtk_source_buffer_set_escape_char
+<a class="indexterm" name="id2595624"></a><pre class="programlisting">void gtk_source_buffer_set_escape_char
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
gunichar escape_char);</pre>
<p>
@@ -608,9 +614,9 @@ This setting affects only syntax pattern
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570391"></a><h3>
+<a name="id2595714"></a><h3>
<a name="gtk-source-buffer-can-undo"></a>gtk_source_buffer_can_undo ()</h3>
-<a class="indexterm" name="id2570403"></a><pre class="programlisting">gboolean gtk_source_buffer_can_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2595725"></a><pre class="programlisting">gboolean gtk_source_buffer_can_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether a source buffer can undo the last action.</p>
<p>
@@ -634,9 +640,9 @@ Determines whether a source buffer can u
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570481"></a><h3>
+<a name="id2595795"></a><h3>
<a name="gtk-source-buffer-can-redo"></a>gtk_source_buffer_can_redo ()</h3>
-<a class="indexterm" name="id2570493"></a><pre class="programlisting">gboolean gtk_source_buffer_can_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2595806"></a><pre class="programlisting">gboolean gtk_source_buffer_can_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Determines whether a source buffer can redo the last action
(i.e. if the last operation was an undo).</p>
@@ -661,9 +667,9 @@ Determines whether a source buffer can r
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570571"></a><h3>
+<a name="id2595875"></a><h3>
<a name="gtk-source-buffer-undo"></a>gtk_source_buffer_undo ()</h3>
-<a class="indexterm" name="id2570582"></a><pre class="programlisting">void gtk_source_buffer_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2595886"></a><pre class="programlisting">void gtk_source_buffer_undo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Undoes the last user action which modified the buffer. Use
<a href="GtkSourceBuffer.html#gtk-source-buffer-can-undo"><code class="function">gtk_source_buffer_can_undo()</code></a> to check whether a call to this
@@ -688,9 +694,9 @@ Actions are defined as groups of operati
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570676"></a><h3>
+<a name="id2595972"></a><h3>
<a name="gtk-source-buffer-redo"></a>gtk_source_buffer_redo ()</h3>
-<a class="indexterm" name="id2570687"></a><pre class="programlisting">void gtk_source_buffer_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2595982"></a><pre class="programlisting">void gtk_source_buffer_redo (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Redoes the last undo operation. Use <a href="GtkSourceBuffer.html#gtk-source-buffer-can-redo"><code class="function">gtk_source_buffer_can_redo()</code></a>
to check whether a call to this function will have any effect.</p>
@@ -708,9 +714,9 @@ to check whether a call to this function
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570755"></a><h3>
+<a name="id2596043"></a><h3>
<a name="gtk-source-buffer-begin-not-undoable-action"></a>gtk_source_buffer_begin_not_undoable_action ()</h3>
-<a class="indexterm" name="id2570770"></a><pre class="programlisting">void gtk_source_buffer_begin_not_undoable_action
+<a class="indexterm" name="id2596057"></a><pre class="programlisting">void gtk_source_buffer_begin_not_undoable_action
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Marks the beginning of a not undoable action on the buffer,
@@ -735,9 +741,9 @@ You may nest <a href="GtkSourceBuffer.ht
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2549231"></a><h3>
+<a name="id2596135"></a><h3>
<a name="gtk-source-buffer-end-not-undoable-action"></a>gtk_source_buffer_end_not_undoable_action ()</h3>
-<a class="indexterm" name="id2548545"></a><pre class="programlisting">void gtk_source_buffer_end_not_undoable_action
+<a class="indexterm" name="id2596149"></a><pre class="programlisting">void gtk_source_buffer_end_not_undoable_action
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Marks the end of a not undoable action on the buffer. When the
@@ -758,9 +764,9 @@ is re-enabled.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2570907"></a><h3>
+<a name="id2596203"></a><h3>
<a name="gtk-source-buffer-create-marker"></a>gtk_source_buffer_create_marker ()</h3>
-<a class="indexterm" name="id2570920"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_create_marker
+<a class="indexterm" name="id2596216"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_create_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
const gchar *name,
const gchar *type,
@@ -782,7 +788,9 @@ emissions.
</p>
<p>
Like a <span class="type">GtkTextMark</span>, a <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a> can be anonymous if the
-passed <em class="parameter"><code>name</code></em> is <code class="literal">NULL</code>. Also, the buffer owns the markers so you
+passed <em class="parameter"><code>name</code></em> is <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>. Also, the buffer owns the markers so you
shouldn't unreference it.
</p>
<p>
@@ -807,12 +815,16 @@ executing instruction indication in a so
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>name</code></em> :</span></td>
-<td> the name of the marker, or <code class="literal">NULL</code>.
+<td> the name of the marker, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>type</code></em> :</span></td>
-<td> a string defining the marker type, or <code class="literal">NULL</code>.
+<td> a string defining the marker type, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
<tr>
@@ -830,9 +842,9 @@ executing instruction indication in a so
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571148"></a><h3>
+<a name="id2596444"></a><h3>
<a name="gtk-source-buffer-move-marker"></a>gtk_source_buffer_move_marker ()</h3>
-<a class="indexterm" name="id2571161"></a><pre class="programlisting">void gtk_source_buffer_move_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2596457"></a><pre class="programlisting">void gtk_source_buffer_move_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker,
const GtkTextIter *where);</pre>
<p>
@@ -863,9 +875,9 @@ Moves <em class="parameter"><code>marker
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571272"></a><h3>
+<a name="id2596568"></a><h3>
<a name="gtk-source-buffer-delete-marker"></a>gtk_source_buffer_delete_marker ()</h3>
-<a class="indexterm" name="id2571284"></a><pre class="programlisting">void gtk_source_buffer_delete_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
+<a class="indexterm" name="id2596580"></a><pre class="programlisting">void gtk_source_buffer_delete_marker (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Deletes <em class="parameter"><code>marker</code></em> from the source buffer. The same conditions as for
@@ -893,14 +905,16 @@ destroyed.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571380"></a><h3>
+<a name="id2596676"></a><h3>
<a name="gtk-source-buffer-get-marker"></a>gtk_source_buffer_get_marker ()</h3>
-<a class="indexterm" name="id2571393"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_marker
+<a class="indexterm" name="id2596688"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
const gchar *name);</pre>
<p>
Looks up the <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a> named <em class="parameter"><code>name</code></em> in <em class="parameter"><code>buffer</code></em>, returning
-<code class="literal">NULL</code> if it doesn't exists.</p>
+<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if it doesn't exists.</p>
<p>
</p>
@@ -919,7 +933,9 @@ Looks up the <a href="gtksourceview-GtkS
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> the <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a> whose name is <em class="parameter"><code>name</code></em>, or <code class="literal">NULL</code>.
+<td> the <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a> whose name is <em class="parameter"><code>name</code></em>, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -927,9 +943,9 @@ Looks up the <a href="gtksourceview-GtkS
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571518"></a><h3>
+<a name="id2596814"></a><h3>
<a name="gtk-source-buffer-get-markers-in-region"></a>gtk_source_buffer_get_markers_in_region ()</h3>
-<a class="indexterm" name="id2571531"></a><pre class="programlisting">GSList* gtk_source_buffer_get_markers_in_region
+<a class="indexterm" name="id2596827"></a><pre class="programlisting">GSList* gtk_source_buffer_get_markers_in_region
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
const GtkTextIter *begin,
const GtkTextIter *end);</pre>
@@ -968,9 +984,9 @@ Returns an <span class="emphasis"><em>or
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571677"></a><h3>
+<a name="id2596972"></a><h3>
<a name="gtk-source-buffer-get-first-marker"></a>gtk_source_buffer_get_first_marker ()</h3>
-<a class="indexterm" name="id2571690"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_first_marker
+<a class="indexterm" name="id2596986"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_first_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Returns the first (nearest to the top of the buffer) marker in
@@ -988,7 +1004,9 @@ Returns the first (nearest to the top of
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a reference to the first <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a>, or <code class="literal">NULL</code> if
+<td> a reference to the first <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a>, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if
there are no markers in the buffer.
</td>
</tr>
@@ -997,9 +1015,9 @@ there are no markers in the buffer.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571772"></a><h3>
+<a name="id2597068"></a><h3>
<a name="gtk-source-buffer-get-last-marker"></a>gtk_source_buffer_get_last_marker ()</h3>
-<a class="indexterm" name="id2571785"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_last_marker
+<a class="indexterm" name="id2597081"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_last_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Returns the last (nearest to the bottom of the buffer) marker in
@@ -1017,7 +1035,9 @@ Returns the last (nearest to the bottom
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a reference to the last <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a>, or <code class="literal">NULL</code> if
+<td> a reference to the last <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a>, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if
there are no markers in the buffer.
</td>
</tr>
@@ -1026,9 +1046,9 @@ there are no markers in the buffer.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571867"></a><h3>
+<a name="id2597163"></a><h3>
<a name="gtk-source-buffer-get-iter-at-marker"></a>gtk_source_buffer_get_iter_at_marker ()</h3>
-<a class="indexterm" name="id2571880"></a><pre class="programlisting">void gtk_source_buffer_get_iter_at_marker
+<a class="indexterm" name="id2597176"></a><pre class="programlisting">void gtk_source_buffer_get_iter_at_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
GtkTextIter *iter,
<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
@@ -1060,9 +1080,9 @@ Initializes <em class="parameter"><code>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2571997"></a><h3>
+<a name="id2597293"></a><h3>
<a name="gtk-source-buffer-get-next-marker"></a>gtk_source_buffer_get_next_marker ()</h3>
-<a class="indexterm" name="id2572011"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_next_marker
+<a class="indexterm" name="id2597306"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_next_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
GtkTextIter *iter);</pre>
<p>
@@ -1090,7 +1110,9 @@ others using <a href="gtksourceview-GtkS
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
<td> the <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a> nearest to the right of <em class="parameter"><code>iter</code></em>,
-or <code class="literal">NULL</code> if there are no more markers after <em class="parameter"><code>iter</code></em>.
+or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if there are no more markers after <em class="parameter"><code>iter</code></em>.
</td>
</tr>
</tbody>
@@ -1098,9 +1120,9 @@ or <code class="literal">NULL</code> if
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572134"></a><h3>
+<a name="id2597430"></a><h3>
<a name="gtk-source-buffer-get-prev-marker"></a>gtk_source_buffer_get_prev_marker ()</h3>
-<a class="indexterm" name="id2572148"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_prev_marker
+<a class="indexterm" name="id2597444"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_buffer_get_prev_marker
(<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer,
GtkTextIter *iter);</pre>
<p>
@@ -1128,7 +1150,9 @@ others using <a href="gtksourceview-GtkS
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
<td> the <a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker"><span class="type">GtkSourceMarker</span></a> nearest to the left of <em class="parameter"><code>iter</code></em>,
-or <code class="literal">NULL</code> if there are no more markers before <em class="parameter"><code>iter</code></em>.
+or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if there are no more markers before <em class="parameter"><code>iter</code></em>.
</td>
</tr>
</tbody>
@@ -1136,53 +1160,53 @@ or <code class="literal">NULL</code> if
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2572272"></a><h2>Property Details</h2>
+<a name="id2597568"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2572282"></a><h3>
+<a name="id2597578"></a><h3>
<a name="GtkSourceBuffer--check-brackets"></a>The "<code class="literal">check-brackets</code>" property</h3>
-<a class="indexterm" name="id2572296"></a><pre class="programlisting"> "check-brackets" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2597592"></a><pre class="programlisting"> "check-brackets" gboolean : Read / Write</pre>
<p>Whether to check and highlight matching brackets.</p>
<p>Default value: TRUE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572320"></a><h3>
+<a name="id2597616"></a><h3>
<a name="GtkSourceBuffer--escape-char"></a>The "<code class="literal">escape-char</code>" property</h3>
-<a class="indexterm" name="id2572334"></a><pre class="programlisting"> "escape-char" guint : Read / Write</pre>
+<a class="indexterm" name="id2597630"></a><pre class="programlisting"> "escape-char" guint : Read / Write</pre>
<p>Escaping character for syntax patterns.</p>
<p>Default value: 0</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572357"></a><h3>
+<a name="id2597653"></a><h3>
<a name="GtkSourceBuffer--highlight"></a>The "<code class="literal">highlight</code>" property</h3>
-<a class="indexterm" name="id2572370"></a><pre class="programlisting"> "highlight" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2597666"></a><pre class="programlisting"> "highlight" gboolean : Read / Write</pre>
<p>Whether to highlight syntax in the buffer.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572393"></a><h3>
+<a name="id2597689"></a><h3>
<a name="GtkSourceBuffer--language"></a>The "<code class="literal">language</code>" property</h3>
-<a class="indexterm" name="id2572406"></a><pre class="programlisting"> "language" <a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> : Read / Write</pre>
+<a class="indexterm" name="id2597702"></a><pre class="programlisting"> "language" <a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> : Read / Write</pre>
<p>Language object to get highlighting patterns from.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572426"></a><h3>
+<a name="id2597721"></a><h3>
<a name="GtkSourceBuffer--max-undo-levels"></a>The "<code class="literal">max-undo-levels</code>" property</h3>
-<a class="indexterm" name="id2572440"></a><pre class="programlisting"> "max-undo-levels" gint : Read / Write</pre>
+<a class="indexterm" name="id2597736"></a><pre class="programlisting"> "max-undo-levels" gint : Read / Write</pre>
<p>Number of undo levels for the buffer.</p>
<p>Allowed values: [0,200]</p>
<p>Default value: 25</p>
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2572468"></a><h2>Signal Details</h2>
+<a name="id2597764"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2572477"></a><h3>
+<a name="id2597773"></a><h3>
<a name="GtkSourceBuffer-can-redo"></a>The "can-redo" signal</h3>
-<a class="indexterm" name="id2572484"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
+<a class="indexterm" name="id2597780"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
gboolean arg1,
gpointer user_data) : Run last</pre>
<p>
@@ -1212,9 +1236,9 @@ operation.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572567"></a><h3>
+<a name="id2597863"></a><h3>
<a name="GtkSourceBuffer-can-undo"></a>The "can-undo" signal</h3>
-<a class="indexterm" name="id2572574"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
+<a class="indexterm" name="id2597870"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
gboolean arg1,
gpointer user_data) : Run last</pre>
<p>
@@ -1244,9 +1268,9 @@ operation.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572657"></a><h3>
+<a name="id2597953"></a><h3>
<a name="GtkSourceBuffer-highlight-updated"></a>The "highlight-updated" signal</h3>
-<a class="indexterm" name="id2572666"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
+<a class="indexterm" name="id2597962"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
GtkTextIter *arg1,
GtkTextIter *arg2,
gpointer user_data) : Run last</pre>
@@ -1286,9 +1310,9 @@ this signal.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2572782"></a><h3>
+<a name="id2598078"></a><h3>
<a name="GtkSourceBuffer-marker-updated"></a>The "marker-updated" signal</h3>
-<a class="indexterm" name="id2572791"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
+<a class="indexterm" name="id2598087"></a><pre class="programlisting">void user_function (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *sourcebuffer,
GtkTextIter *arg1,
gpointer user_data) : Run last</pre>
<p>
@@ -1324,7 +1348,7 @@ one for the old location and one for the
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2572893"></a><h2>See Also</h2>
+<a name="id2598193"></a><h2>See Also</h2>
<p>
There is an introduction document
describing the basic concepts of the buffer/view interactions.
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceLanguage.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceLanguage.html
--- 1.8.2-1/docs/reference/html/GtkSourceLanguage.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceLanguage.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceLanguage</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceView.html" title="GtkSourceView">
@@ -21,22 +21,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceLanguagesManager.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2531317" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2549469" class="shortcut">Top</a>
 | 
- <a href="#id2533647" class="shortcut">Description</a>
+ <a href="#id2554362" class="shortcut">Description</a>
 | 
- <a href="#id2533571" class="shortcut">Object Hierarchy</a>
+ <a href="#id2554286" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2533595" class="shortcut">Signals</a></nobr></td></tr>
+ <a href="#id2554310" class="shortcut">Signals</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceLanguage"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2531317"></a><span class="refentrytitle">GtkSourceLanguage</span>
+<a name="id2549469"></a><span class="refentrytitle">GtkSourceLanguage</span>
</h2>
-<p>GtkSourceLanguage — </p>
+<p>GtkSourceLanguage</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -77,7 +77,7 @@ void <a href="GtkSourceLanguage.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2533571"></a><h2>Object Hierarchy</h2>
+<a name="id2554286"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -85,7 +85,7 @@ void <a href="GtkSourceLanguage.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2533595"></a><h2>Signals</h2>
+<a name="id2554310"></a><h2>Signals</h2>
<pre class="synopsis">
"<a href="GtkSourceLanguage.html#GtkSourceLanguage-tag-style-changed">tag-style-changed</a>"
@@ -95,26 +95,26 @@ void <a href="GtkSourceLanguage.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2533647"></a><h2>Description</h2>
+<a name="id2554362"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2527727"></a><h2>Details</h2>
+<a name="id2590043"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2527738"></a><h3>
+<a name="id2590054"></a><h3>
<a name="GtkSourceLanguage-struct"></a>GtkSourceLanguage</h3>
-<a class="indexterm" name="id2527750"></a><pre class="programlisting">typedef struct _GtkSourceLanguage GtkSourceLanguage;</pre>
+<a class="indexterm" name="id2590065"></a><pre class="programlisting">typedef struct _GtkSourceLanguage GtkSourceLanguage;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527766"></a><h3>
+<a name="id2590082"></a><h3>
<a name="gtk-source-language-get-name"></a>gtk_source_language_get_name ()</h3>
-<a class="indexterm" name="id2527780"></a><pre class="programlisting">gchar* gtk_source_language_get_name (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
+<a class="indexterm" name="id2590095"></a><pre class="programlisting">gchar* gtk_source_language_get_name (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns the localized name of the language.</p>
<p>
@@ -138,9 +138,9 @@ Returns the localized name of the langua
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527855"></a><h3>
+<a name="id2590170"></a><h3>
<a name="gtk-source-language-get-section"></a>gtk_source_language_get_section ()</h3>
-<a class="indexterm" name="id2527868"></a><pre class="programlisting">gchar* gtk_source_language_get_section (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
+<a class="indexterm" name="id2590183"></a><pre class="programlisting">gchar* gtk_source_language_get_section (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns the localized section of the language.
Each language belong to a section (ex. HTML belogs to the
@@ -166,9 +166,9 @@ Markup section).</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527944"></a><h3>
+<a name="id2590259"></a><h3>
<a name="gtk-source-language-get-tags"></a>gtk_source_language_get_tags ()</h3>
-<a class="indexterm" name="id2527957"></a><pre class="programlisting">GSList* gtk_source_language_get_tags (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
+<a class="indexterm" name="id2590273"></a><pre class="programlisting">GSList* gtk_source_language_get_tags (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns a list of tags for the given <em class="parameter"><code>language</code></em>. You should unref the tags
and free the list after usage.</p>
@@ -193,9 +193,9 @@ and free the list after usage.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2542421"></a><h3>
+<a name="id2549058"></a><h3>
<a name="gtk-source-language-get-escape-char"></a>gtk_source_language_get_escape_char ()</h3>
-<a class="indexterm" name="id2542435"></a><pre class="programlisting">gunichar gtk_source_language_get_escape_char
+<a class="indexterm" name="id2549072"></a><pre class="programlisting">gunichar gtk_source_language_get_escape_char
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Gets the value of the ESC character in the given <em class="parameter"><code>language</code></em>.</p>
@@ -220,9 +220,9 @@ Gets the value of the ESC character in t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2542511"></a><h3>
+<a name="id2549147"></a><h3>
<a name="gtk-source-language-get-mime-types"></a>gtk_source_language_get_mime_types ()</h3>
-<a class="indexterm" name="id2542525"></a><pre class="programlisting">GSList* gtk_source_language_get_mime_types
+<a class="indexterm" name="id2549161"></a><pre class="programlisting">GSList* gtk_source_language_get_mime_types
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Returns a list of mime types for the given <em class="parameter"><code>language</code></em>. After usage you should
@@ -248,14 +248,16 @@ free each element of the list as well as
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2542601"></a><h3>
+<a name="id2549238"></a><h3>
<a name="gtk-source-language-set-mime-types"></a>gtk_source_language_set_mime_types ()</h3>
-<a class="indexterm" name="id2542615"></a><pre class="programlisting">void gtk_source_language_set_mime_types
+<a class="indexterm" name="id2549252"></a><pre class="programlisting">void gtk_source_language_set_mime_types
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const GSList *mime_types);</pre>
<p>
Sets a list of <em class="parameter"><code>mime_types</code></em> for the given <em class="parameter"><code>language</code></em>.
-If <em class="parameter"><code>mime_types</code></em> is <code class="literal">NULL</code> this function will use the default mime
+If <em class="parameter"><code>mime_types</code></em> is <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> this function will use the default mime
types from the language file.</p>
<p>
@@ -278,9 +280,9 @@ types from the language file.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2536825"></a><h3>
+<a name="id2598777"></a><h3>
<a name="gtk-source-language-get-style-scheme"></a>gtk_source_language_get_style_scheme ()</h3>
-<a class="indexterm" name="id2536838"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_language_get_style_scheme
+<a class="indexterm" name="id2598790"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_language_get_style_scheme
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language);</pre>
<p>
Gets the style scheme associated with the given <em class="parameter"><code>language</code></em>.</p>
@@ -305,9 +307,9 @@ Gets the style scheme associated with th
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2536920"></a><h3>
+<a name="id2598872"></a><h3>
<a name="gtk-source-language-set-style-scheme"></a>gtk_source_language_set_style_scheme ()</h3>
-<a class="indexterm" name="id2536934"></a><pre class="programlisting">void gtk_source_language_set_style_scheme
+<a class="indexterm" name="id2598886"></a><pre class="programlisting">void gtk_source_language_set_style_scheme
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *scheme);</pre>
<p>
@@ -333,9 +335,9 @@ Sets the style scheme of the given <em c
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2573768"></a><h3>
+<a name="id2598978"></a><h3>
<a name="gtk-source-language-get-tag-style"></a>gtk_source_language_get_tag_style ()</h3>
-<a class="indexterm" name="id2573782"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_style
+<a class="indexterm" name="id2598992"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_style
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const gchar *tag_id);</pre>
<p>
@@ -367,14 +369,16 @@ not defined then returns the default sty
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2573894"></a><h3>
+<a name="id2599104"></a><h3>
<a name="gtk-source-language-set-tag-style"></a>gtk_source_language_set_tag_style ()</h3>
-<a class="indexterm" name="id2573908"></a><pre class="programlisting">void gtk_source_language_set_tag_style
+<a class="indexterm" name="id2599118"></a><pre class="programlisting">void gtk_source_language_set_tag_style
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const gchar *tag_id,
const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
-Sets the <em class="parameter"><code>style</code></em> of the tag whose ID is <em class="parameter"><code>tag_id</code></em>. If <em class="parameter"><code>style</code></em> is <code class="literal">NULL</code>
+Sets the <em class="parameter"><code>style</code></em> of the tag whose ID is <em class="parameter"><code>tag_id</code></em>. If <em class="parameter"><code>style</code></em> is <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>
restore the default style.</p>
<p>
@@ -402,9 +406,9 @@ restore the default style.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574049"></a><h3>
+<a name="id2599259"></a><h3>
<a name="gtk-source-language-get-tag-default-style"></a>gtk_source_language_get_tag_default_style ()</h3>
-<a class="indexterm" name="id2574064"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_default_style
+<a class="indexterm" name="id2599274"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_language_get_tag_default_style
(<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *language,
const gchar *tag_id);</pre>
<p>
@@ -435,11 +439,11 @@ Gets the default style of the tag whose
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2574176"></a><h2>Signal Details</h2>
+<a name="id2599386"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2574187"></a><h3>
+<a name="id2599397"></a><h3>
<a name="GtkSourceLanguage-tag-style-changed"></a>The "tag-style-changed" signal</h3>
-<a class="indexterm" name="id2574197"></a><pre class="programlisting">void user_function (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *sourcelanguage,
+<a class="indexterm" name="id2599407"></a><pre class="programlisting">void user_function (<a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a> *sourcelanguage,
gchar *arg1,
gpointer user_data) : Run last</pre>
<p>
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceLanguagesManager.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceLanguagesManager.html
--- 1.8.2-1/docs/reference/html/GtkSourceLanguagesManager.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceLanguagesManager.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceLanguagesManager</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceLanguage.html" title="GtkSourceLanguage">
@@ -21,22 +21,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceStyleScheme.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2566600" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2583790" class="shortcut">Top</a>
 | 
- <a href="#id2542158" class="shortcut">Description</a>
+ <a href="#id2563566" class="shortcut">Description</a>
 | 
- <a href="#id2542104" class="shortcut">Object Hierarchy</a>
+ <a href="#id2563512" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2542127" class="shortcut">Properties</a></nobr></td></tr>
+ <a href="#id2563535" class="shortcut">Properties</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceLanguagesManager"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2566600"></a><span class="refentrytitle">GtkSourceLanguagesManager</span>
+<a name="id2583790"></a><span class="refentrytitle">GtkSourceLanguagesManager</span>
</h2>
-<p>GtkSourceLanguagesManager — </p>
+<p>GtkSourceLanguagesManager</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -61,7 +61,7 @@ const GSList* <a href="GtkSourceLanguage
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2542104"></a><h2>Object Hierarchy</h2>
+<a name="id2563512"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -69,33 +69,33 @@ const GSList* <a href="GtkSourceLanguage
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2542127"></a><h2>Properties</h2>
+<a name="id2563535"></a><h2>Properties</h2>
<pre class="synopsis">
"<a href="GtkSourceLanguagesManager.html#GtkSourceLanguagesManager--lang-files-dirs">lang-files-dirs</a>" gpointer : Read / Write / Construct Only
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2542158"></a><h2>Description</h2>
+<a name="id2563566"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2542174"></a><h2>Details</h2>
+<a name="id2563582"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2542185"></a><h3>
+<a name="id2563593"></a><h3>
<a name="GtkSourceLanguagesManager-struct"></a>GtkSourceLanguagesManager</h3>
-<a class="indexterm" name="id2536417"></a><pre class="programlisting">typedef struct _GtkSourceLanguagesManager GtkSourceLanguagesManager;</pre>
+<a class="indexterm" name="id2550223"></a><pre class="programlisting">typedef struct _GtkSourceLanguagesManager GtkSourceLanguagesManager;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2536433"></a><h3>
+<a name="id2550240"></a><h3>
<a name="gtk-source-languages-manager-new"></a>gtk_source_languages_manager_new ()</h3>
-<a class="indexterm" name="id2536444"></a><pre class="programlisting"><a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a>* gtk_source_languages_manager_new
+<a class="indexterm" name="id2550251"></a><pre class="programlisting"><a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a>* gtk_source_languages_manager_new
(void);</pre>
<p>
Creates a new language manager.</p>
@@ -113,9 +113,9 @@ Creates a new language manager.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2536490"></a><h3>
+<a name="id2550297"></a><h3>
<a name="gtk-source-languages-manager-get-available-languages"></a>gtk_source_languages_manager_get_available_languages ()</h3>
-<a class="indexterm" name="id2536505"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_available_languages
+<a class="indexterm" name="id2550311"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_available_languages
(<a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a> *lm);</pre>
<p>
Gets a list of available languages for the given language manager.
@@ -142,9 +142,9 @@ free it after usage.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2528094"></a><h3>
+<a name="id2598423"></a><h3>
<a name="gtk-source-languages-manager-get-language-from-mime-type"></a>gtk_source_languages_manager_get_language_from_mime_type ()</h3>
-<a class="indexterm" name="id2528109"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_languages_manager_get_language_from_mime_type
+<a class="indexterm" name="id2598438"></a><pre class="programlisting"><a href="GtkSourceLanguage.html" title="GtkSourceLanguage">GtkSourceLanguage</a>* gtk_source_languages_manager_get_language_from_mime_type
(<a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a> *lm,
const gchar *mime_type);</pre>
<p>
@@ -168,7 +168,9 @@ in the language manager.</p>
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a>, or <code class="literal">NULL</code> if there is no language
+<td> a <a href="GtkSourceLanguage.html" title="GtkSourceLanguage"><span class="type">GtkSourceLanguage</span></a>, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if there is no language
associated with the given <em class="parameter"><code>mime_type</code></em>.
</td>
</tr>
@@ -177,9 +179,9 @@ associated with the given <em class="par
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2528234"></a><h3>
+<a name="id2598563"></a><h3>
<a name="gtk-source-languages-manager-get-lang-files-dirs"></a>gtk_source_languages_manager_get_lang_files_dirs ()</h3>
-<a class="indexterm" name="id2528248"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_lang_files_dirs
+<a class="indexterm" name="id2589482"></a><pre class="programlisting">const GSList* gtk_source_languages_manager_get_lang_files_dirs
(<a href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">GtkSourceLanguagesManager</a> *lm);</pre>
<p>
Gets a list of language files directories for the given language manager.</p>
@@ -204,11 +206,11 @@ Gets a list of language files directorie
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2528321"></a><h2>Property Details</h2>
+<a name="id2589553"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2528331"></a><h3>
+<a name="id2589564"></a><h3>
<a name="GtkSourceLanguagesManager--lang-files-dirs"></a>The "<code class="literal">lang-files-dirs</code>" property</h3>
-<a class="indexterm" name="id2528346"></a><pre class="programlisting"> "lang-files-dirs" gpointer : Read / Write / Construct Only</pre>
+<a class="indexterm" name="id2589578"></a><pre class="programlisting"> "lang-files-dirs" gpointer : Read / Write / Construct Only</pre>
<p>List of directories where the language specification files (.lang) are located.</p>
</div>
</div>
diff -pruN 1.8.2-1/docs/reference/html/GtkSourcePrintJob.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourcePrintJob.html
--- 1.8.2-1/docs/reference/html/GtkSourcePrintJob.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourcePrintJob.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourcePrintJob</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="gtksourceview-GtkSourceTagStyle.html" title="GtkSourceTagStyle">
@@ -20,22 +20,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td> </td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2545683" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2566124" class="shortcut">Top</a>
 | 
- <a href="#id2589944" class="shortcut">Description</a>
+ <a href="#id2615291" class="shortcut">Description</a>
 | 
- <a href="#id2589687" class="shortcut">Object Hierarchy</a>
+ <a href="#id2615032" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2589708" class="shortcut">Properties</a>
+ <a href="#id2615053" class="shortcut">Properties</a>
 | 
- <a href="#id2589880" class="shortcut">Signals</a></nobr></td></tr>
+ <a href="#id2615227" class="shortcut">Signals</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourcePrintJob"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2545683"></a><span class="refentrytitle">GtkSourcePrintJob</span>
+<a name="id2566124"></a><span class="refentrytitle">GtkSourcePrintJob</span>
</h2>
<p>GtkSourcePrintJob — Printing a <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a>.</p>
</td>
@@ -49,21 +49,13 @@
<a href="GtkSourcePrintJob.html#GtkSourcePrintJob-struct">GtkSourcePrintJob</a>;
-<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-new">gtk_source_print_job_new</a> (<a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> *config);
+<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-new">gtk_source_print_job_new</a> (GnomePrintConfig *config);
<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-new-with-buffer">gtk_source_print_job_new_with_buffer</a>
- (<a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> *config,
+ (GnomePrintConfig *config,
<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);
void <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-config">gtk_source_print_job_set_config</a> (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
- <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> *config);
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-config">gtk_source_print_job_get_config</a>
+ GnomePrintConfig *config);
+GnomePrintConfig* <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-config">gtk_source_print_job_get_config</a>
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
void <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-buffer">gtk_source_print_job_set_buffer</a> (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);
@@ -122,12 +114,8 @@ void <a href="GtkSourcePrintJob.h
gdouble *bottom,
gdouble *left,
gdouble *right);
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
->GnomePrintJob</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-print">gtk_source_print_job_print</a> (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
->GnomePrintJob</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-print-range">gtk_source_print_job_print_range</a>
+GnomePrintJob* <a href="GtkSourcePrintJob.html#gtk-source-print-job-print">gtk_source_print_job_print</a> (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
+GnomePrintJob* <a href="GtkSourcePrintJob.html#gtk-source-print-job-print-range">gtk_source_print_job_print_range</a>
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const GtkTextIter *start,
const GtkTextIter *end);
@@ -136,16 +124,12 @@ gboolean <a href="GtkSourcePrintJob.h
const GtkTextIter *start,
const GtkTextIter *end);
void <a href="GtkSourcePrintJob.html#gtk-source-print-job-cancel">gtk_source_print_job_cancel</a> (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
->GnomePrintJob</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-job">gtk_source_print_job_get_print_job</a>
+GnomePrintJob* <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-job">gtk_source_print_job_get_print_job</a>
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
guint <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-page">gtk_source_print_job_get_page</a> (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
guint <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-page-count">gtk_source_print_job_get_page_count</a>
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print.html#GnomePrintContext"
->GnomePrintContext</a>* <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-context">gtk_source_print_job_get_print_context</a>
+GnomePrintContext* <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-context">gtk_source_print_job_get_print_context</a>
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);
void <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-print-header">gtk_source_print_job_set_print_header</a>
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
@@ -183,7 +167,7 @@ void <a href="GtkSourcePrintJob.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2589687"></a><h2>Object Hierarchy</h2>
+<a name="id2615032"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -191,13 +175,11 @@ void <a href="GtkSourcePrintJob.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2589708"></a><h2>Properties</h2>
+<a name="id2615053"></a><h2>Properties</h2>
<pre class="synopsis">
"<a href="GtkSourcePrintJob.html#GtkSourcePrintJob--buffer">buffer</a>" <a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> : Read / Write
- "<a href="GtkSourcePrintJob.html#GtkSourcePrintJob--config">config</a>" <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> : Read / Write
+ "<a href="GtkSourcePrintJob.html#GtkSourcePrintJob--config">config</a>" GnomePrintConfig : Read / Write
"<a href="GtkSourcePrintJob.html#GtkSourcePrintJob--font">font</a>" gchararray : Read / Write
"<a href="GtkSourcePrintJob.html#GtkSourcePrintJob--font-desc">font-desc</a>" PangoFontDescription : Read / Write
"<a href="GtkSourcePrintJob.html#GtkSourcePrintJob--header-footer-font">header-footer-font</a>" gchararray : Read / Write
@@ -213,7 +195,7 @@ href="../libgnomeprint/libgnomeprint-gno
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2589880"></a><h2>Signals</h2>
+<a name="id2615227"></a><h2>Signals</h2>
<pre class="synopsis">
"<a href="GtkSourcePrintJob.html#GtkSourcePrintJob-begin-page">begin-page</a>"
@@ -224,20 +206,14 @@ href="../libgnomeprint/libgnomeprint-gno
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2589944"></a><h2>Description</h2>
+<a name="id2615291"></a><h2>Description</h2>
<p>
The <a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob"><span class="type">GtkSourcePrintJob</span></a> object is used to print the contents of a
<a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a>. You can set various configuration options to
customize the printed output, and the result is obtained as a
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> object, which you can then preview with
-<a
-href="../libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html#gnome-print-job-preview-new"
-><code class="function">gnome_print_job_preview_new()</code></a> or print directly with
-<a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#gnome-print-job-print"
-><code class="function">gnome_print_job_print()</code></a>.
+<span class="type">GnomePrintJob</span> object, which you can then preview with
+<code class="function">gnome_print_job_preview_new()</code> or print directly with
+<code class="function">gnome_print_job_print()</code>.
</p>
<p>
Printing can be done synchronously and asynchronously. Asynchronous
@@ -247,12 +223,8 @@ and <a href="GtkSourcePrintJob.html#GtkS
signals).
</p>
<p>
-The task of a <a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob"><span class="type">GtkSourcePrintJob</span></a> is to produce a <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a>. What
-this means is that once you get the resulting <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a>, you
+The task of a <a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob"><span class="type">GtkSourcePrintJob</span></a> is to produce a <span class="type">GnomePrintJob</span>. What
+this means is that once you get the resulting <span class="type">GnomePrintJob</span>, you
might reuse the <a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob"><span class="type">GtkSourcePrintJob</span></a> to produce another output (with
different configuration options for example) or just unreference it
and forget about it. The lifetime of the produced object is
@@ -279,14 +251,10 @@ manually. To do that, you need to conne
signal of the job and allocate some space in the page using
<a href="GtkSourcePrintJob.html#gtk-source-print-job-set-text-margins"><code class="function">gtk_source_print_job_set_text_margins()</code></a>. Whenever <a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob"><span class="type">GtkSourcePrintJob</span></a>
is about to print a new text page, the signal will be emitted. You
-can then get the <a
-href="../libgnomeprint/libgnomeprint-gnome-print.html#GnomePrintContext"
-><span class="type">GnomePrintContext</span></a> being used with
+can then get the <span class="type">GnomePrintContext</span> being used with
<a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-context"><code class="function">gtk_source_print_job_get_print_context()</code></a> and use Gnome Print functions
directly. The space you allocate is inside the document margins
-defined in the specified <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a>, but outside all print area
+defined in the specified <span class="type">GnomePrintConfig</span>, but outside all print area
used by <a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob"><span class="type">GtkSourcePrintJob</span></a> itself.
</p>
<p>
@@ -337,22 +305,20 @@ print_source_buffer_from_view (GtkSource
</pre></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2590228"></a><h2>Details</h2>
+<a name="id2615574"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2590237"></a><h3>
+<a name="id2615584"></a><h3>
<a name="GtkSourcePrintJob-struct"></a>GtkSourcePrintJob</h3>
-<a class="indexterm" name="id2590247"></a><pre class="programlisting">typedef struct _GtkSourcePrintJob GtkSourcePrintJob;</pre>
+<a class="indexterm" name="id2615594"></a><pre class="programlisting">typedef struct _GtkSourcePrintJob GtkSourcePrintJob;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590262"></a><h3>
+<a name="id2615609"></a><h3>
<a name="gtk-source-print-job-new"></a>gtk_source_print_job_new ()</h3>
-<a class="indexterm" name="id2590272"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new (<a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> *config);</pre>
+<a class="indexterm" name="id2615619"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new (GnomePrintConfig *config);</pre>
<p>
Creates a new print job object, initially setting the print configuration.</p>
<p>
@@ -363,9 +329,7 @@ Creates a new print job object, initiall
<tbody>
<tr>
<td><span class="term"><em class="parameter"><code>config</code></em> :</span></td>
-<td> an optional <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a> object.
+<td> an optional <span class="type">GnomePrintConfig</span> object.
</td>
</tr>
<tr>
@@ -378,12 +342,10 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590333"></a><h3>
+<a name="id2615680"></a><h3>
<a name="gtk-source-print-job-new-with-buffer"></a>gtk_source_print_job_new_with_buffer ()</h3>
-<a class="indexterm" name="id2590346"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new_with_buffer
- (<a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> *config,
+<a class="indexterm" name="id2615693"></a><pre class="programlisting"><a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a>* gtk_source_print_job_new_with_buffer
+ (GnomePrintConfig *config,
<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Creates a new print job to print <em class="parameter"><code>buffer</code></em>.</p>
@@ -395,14 +357,14 @@ Creates a new print job to print <em cla
<tbody>
<tr>
<td><span class="term"><em class="parameter"><code>config</code></em> :</span></td>
-<td> an optional <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a>.
+<td> an optional <span class="type">GnomePrintConfig</span>.
</td>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>buffer</code></em> :</span></td>
-<td> the <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> to print (might be <code class="literal">NULL</code>).
+<td> the <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> to print (might be <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>).
</td>
</tr>
<tr>
@@ -415,18 +377,14 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590446"></a><h3>
+<a name="id2615793"></a><h3>
<a name="gtk-source-print-job-set-config"></a>gtk_source_print_job_set_config ()</h3>
-<a class="indexterm" name="id2590459"></a><pre class="programlisting">void gtk_source_print_job_set_config (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
- <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> *config);</pre>
+<a class="indexterm" name="id2615806"></a><pre class="programlisting">void gtk_source_print_job_set_config (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
+ GnomePrintConfig *config);</pre>
<p>
Sets the print configuration for the job. If you don't set a
configuration object for the print job, when needed one will be
-created with <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#gnome-print-config-default"
-><code class="function">gnome_print_config_default()</code></a>.</p>
+created with <code class="function">gnome_print_config_default()</code>.</p>
<p>
</p>
@@ -440,9 +398,7 @@ href="../libgnomeprint/libgnomeprint-gno
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>config</code></em> :</span></td>
-<td> a <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a> object to get printing configuration from.
+<td> a <span class="type">GnomePrintConfig</span> object to get printing configuration from.
</td>
</tr>
</tbody>
@@ -450,16 +406,12 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590547"></a><h3>
+<a name="id2615894"></a><h3>
<a name="gtk-source-print-job-get-config"></a>gtk_source_print_job_get_config ()</h3>
-<a class="indexterm" name="id2590560"></a><pre class="programlisting"><a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a>* gtk_source_print_job_get_config
+<a class="indexterm" name="id2615906"></a><pre class="programlisting">GnomePrintConfig* gtk_source_print_job_get_config
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
-Gets the current <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a> the print job will use. If not
+Gets the current <span class="type">GnomePrintConfig</span> the print job will use. If not
previously set, this will create a default configuration and return
it. The returned object reference is owned by the print job.</p>
<p>
@@ -475,9 +427,7 @@ it. The returned object reference is ow
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> the <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a> for the print job.
+<td> the <span class="type">GnomePrintConfig</span> for the print job.
</td>
</tr>
</tbody>
@@ -485,9 +435,9 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590636"></a><h3>
+<a name="id2615983"></a><h3>
<a name="gtk-source-print-job-set-buffer"></a>gtk_source_print_job_set_buffer ()</h3>
-<a class="indexterm" name="id2590648"></a><pre class="programlisting">void gtk_source_print_job_set_buffer (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
+<a class="indexterm" name="id2615995"></a><pre class="programlisting">void gtk_source_print_job_set_buffer (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Sets the <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> the print job will print. You need to
@@ -514,13 +464,15 @@ creating the print job with <a href="Gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590743"></a><h3>
+<a name="id2616090"></a><h3>
<a name="gtk-source-print-job-get-buffer"></a>gtk_source_print_job_get_buffer ()</h3>
-<a class="indexterm" name="id2590755"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_print_job_get_buffer
+<a class="indexterm" name="id2616102"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_print_job_get_buffer
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Gets the <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> the print job would print. The returned
-object reference (if non <code class="literal">NULL</code>) is owned by the job object and
+object reference (if non <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>) is owned by the job object and
should not be unreferenced.</p>
<p>
@@ -543,9 +495,9 @@ should not be unreferenced.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590839"></a><h3>
+<a name="id2616186"></a><h3>
<a name="gtk-source-print-job-setup-from-view"></a>gtk_source_print_job_setup_from_view ()</h3>
-<a class="indexterm" name="id2590852"></a><pre class="programlisting">void gtk_source_print_job_setup_from_view
+<a class="indexterm" name="id2616199"></a><pre class="programlisting">void gtk_source_print_job_setup_from_view
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
@@ -574,9 +526,9 @@ and default font.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2590938"></a><h3>
+<a name="id2616285"></a><h3>
<a name="gtk-source-print-job-set-tabs-width"></a>gtk_source_print_job_set_tabs_width ()</h3>
-<a class="indexterm" name="id2590952"></a><pre class="programlisting">void gtk_source_print_job_set_tabs_width
+<a class="indexterm" name="id2616298"></a><pre class="programlisting">void gtk_source_print_job_set_tabs_width
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
guint tabs_width);</pre>
<p>
@@ -605,9 +557,9 @@ font. Tabulation stops are set for the
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591032"></a><h3>
+<a name="id2616379"></a><h3>
<a name="gtk-source-print-job-get-tabs-width"></a>gtk_source_print_job_get_tabs_width ()</h3>
-<a class="indexterm" name="id2591045"></a><pre class="programlisting">guint gtk_source_print_job_get_tabs_width
+<a class="indexterm" name="id2616392"></a><pre class="programlisting">guint gtk_source_print_job_get_tabs_width
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the configured width (in equivalent spaces) of
@@ -633,9 +585,9 @@ tabulations. The default value is 8.</p
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591108"></a><h3>
+<a name="id2616455"></a><h3>
<a name="gtk-source-print-job-set-wrap-mode"></a>gtk_source_print_job_set_wrap_mode ()</h3>
-<a class="indexterm" name="id2591121"></a><pre class="programlisting">void gtk_source_print_job_set_wrap_mode
+<a class="indexterm" name="id2616468"></a><pre class="programlisting">void gtk_source_print_job_set_wrap_mode
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
GtkWrapMode wrap);</pre>
<p>
@@ -662,9 +614,9 @@ width. See <span class="type">GtkWrapMo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591200"></a><h3>
+<a name="id2616546"></a><h3>
<a name="gtk-source-print-job-get-wrap-mode"></a>gtk_source_print_job_get_wrap_mode ()</h3>
-<a class="indexterm" name="id2591213"></a><pre class="programlisting">GtkWrapMode gtk_source_print_job_get_wrap_mode
+<a class="indexterm" name="id2616560"></a><pre class="programlisting">GtkWrapMode gtk_source_print_job_get_wrap_mode
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the wrapping style for text lines wider than the
@@ -690,9 +642,9 @@ printable width. The default is no wrap
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591276"></a><h3>
+<a name="id2616623"></a><h3>
<a name="gtk-source-print-job-set-highlight"></a>gtk_source_print_job_set_highlight ()</h3>
-<a class="indexterm" name="id2591289"></a><pre class="programlisting">void gtk_source_print_job_set_highlight
+<a class="indexterm" name="id2616636"></a><pre class="programlisting">void gtk_source_print_job_set_highlight
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gboolean highlight);</pre>
<p>
@@ -719,9 +671,9 @@ buffer rules. Both color and font style
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591370"></a><h3>
+<a name="id2616717"></a><h3>
<a name="gtk-source-print-job-get-highlight"></a>gtk_source_print_job_get_highlight ()</h3>
-<a class="indexterm" name="id2591383"></a><pre class="programlisting">gboolean gtk_source_print_job_get_highlight
+<a class="indexterm" name="id2616730"></a><pre class="programlisting">gboolean gtk_source_print_job_get_highlight
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines if the job is configured to print the text highlighted
@@ -748,9 +700,9 @@ only if the buffer to print has highligh
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591456"></a><h3>
+<a name="id2616803"></a><h3>
<a name="gtk-source-print-job-set-font-desc"></a>gtk_source_print_job_set_font_desc ()</h3>
-<a class="indexterm" name="id2591469"></a><pre class="programlisting">void gtk_source_print_job_set_font_desc
+<a class="indexterm" name="id2616816"></a><pre class="programlisting">void gtk_source_print_job_set_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
PangoFontDescription *desc);</pre>
<p>
@@ -776,9 +728,9 @@ Sets the default font for the printed te
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591546"></a><h3>
+<a name="id2616893"></a><h3>
<a name="gtk-source-print-job-set-font"></a>gtk_source_print_job_set_font ()</h3>
-<a class="indexterm" name="id2591559"></a><pre class="programlisting">void gtk_source_print_job_set_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
+<a class="indexterm" name="id2616906"></a><pre class="programlisting">void gtk_source_print_job_set_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *font_name);</pre>
<p>
Sets the default font for the printed text. <em class="parameter"><code>font_name</code></em> should be a
@@ -786,12 +738,8 @@ Sets the default font for the printed te
(e.g. "Monospace Regular 10.0").
</p>
<p>
-Note that <em class="parameter"><code>font_name</code></em> is a <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> name not a Pango font
-description string. This function is deprecated since <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> is
+Note that <em class="parameter"><code>font_name</code></em> is a <span class="type">GnomeFont</span> name not a Pango font
+description string. This function is deprecated since <span class="type">GnomeFont</span> is
no longer used when implementing printing for GtkSourceView; you
should use <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-font-desc"><code class="function">gtk_source_print_job_set_font_desc()</code></a> instead.</p>
<p>
@@ -815,9 +763,9 @@ should use <a href="GtkSourcePrintJob.ht
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591673"></a><h3>
+<a name="id2617020"></a><h3>
<a name="gtk-source-print-job-get-font-desc"></a>gtk_source_print_job_get_font_desc ()</h3>
-<a class="indexterm" name="id2591686"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_font_desc
+<a class="indexterm" name="id2617033"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the default font to be used for the printed text. The
@@ -846,9 +794,9 @@ should be freed when no longer needed.</
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591752"></a><h3>
+<a name="id2617099"></a><h3>
<a name="gtk-source-print-job-get-font"></a>gtk_source_print_job_get_font ()</h3>
-<a class="indexterm" name="id2591764"></a><pre class="programlisting">gchar* gtk_source_print_job_get_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2617111"></a><pre class="programlisting">gchar* gtk_source_print_job_get_font (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the default font to be used for the printed text. The
returned string is of the form "Fontfamily Style Size",
@@ -856,12 +804,8 @@ for example "Monospace Regular 10.0". T
should be freed when no longer needed.
</p>
<p>
-Note that the result is a <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> name not a Pango font
-description string. This function is deprecated since <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> is
+Note that the result is a <span class="type">GnomeFont</span> name not a Pango font
+description string. This function is deprecated since <span class="type">GnomeFont</span> is
no longer used when implementing printing for GtkSourceView; you
should use <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-font-desc"><code class="function">gtk_source_print_job_get_font_desc()</code></a> instead.</p>
<p>
@@ -886,9 +830,9 @@ text font.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591858"></a><h3>
+<a name="id2617205"></a><h3>
<a name="gtk-source-print-job-set-numbers-font-desc"></a>gtk_source_print_job_set_numbers_font_desc ()</h3>
-<a class="indexterm" name="id2591872"></a><pre class="programlisting">void gtk_source_print_job_set_numbers_font_desc
+<a class="indexterm" name="id2617219"></a><pre class="programlisting">void gtk_source_print_job_set_numbers_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
PangoFontDescription *desc);</pre>
<p>
@@ -908,7 +852,9 @@ text) will be used instead.</p>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>desc</code></em> :</span></td>
-<td> the <span class="type">PangoFontDescription</span> for the font for line numbers, or <code class="literal">NULL</code>
+<td> the <span class="type">PangoFontDescription</span> for the font for line numbers, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>
</td>
</tr>
</tbody>
@@ -916,23 +862,21 @@ text) will be used instead.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2591960"></a><h3>
+<a name="id2617307"></a><h3>
<a name="gtk-source-print-job-set-numbers-font"></a>gtk_source_print_job_set_numbers_font ()</h3>
-<a class="indexterm" name="id2591973"></a><pre class="programlisting">void gtk_source_print_job_set_numbers_font
+<a class="indexterm" name="id2617320"></a><pre class="programlisting">void gtk_source_print_job_set_numbers_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *font_name);</pre>
<p>
Sets the font for printing line numbers on the left margin. If
-<code class="literal">NULL</code> is supplied, the default font (i.e. the one being used for the
+<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> is supplied, the default font (i.e. the one being used for the
text) will be used instead.
</p>
<p>
-Note that <em class="parameter"><code>font_name</code></em> is a <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> name not a Pango font
-description string. This function is deprecated since <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> is
+Note that <em class="parameter"><code>font_name</code></em> is a <span class="type">GnomeFont</span> name not a Pango font
+description string. This function is deprecated since <span class="type">GnomeFont</span> is
no longer used when implementing printing for GtkSourceView; you
should use <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-numbers-font-desc"><code class="function">gtk_source_print_job_set_numbers_font_desc()</code></a> instead.</p>
<p>
@@ -948,7 +892,9 @@ should use <a href="GtkSourcePrintJob.ht
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>font_name</code></em> :</span></td>
-<td> the full name of the font for line numbers, or <code class="literal">NULL</code>.
+<td> the full name of the font for line numbers, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -956,13 +902,15 @@ should use <a href="GtkSourcePrintJob.ht
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592097"></a><h3>
+<a name="id2617444"></a><h3>
<a name="gtk-source-print-job-get-numbers-font-desc"></a>gtk_source_print_job_get_numbers_font_desc ()</h3>
-<a class="indexterm" name="id2592111"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_numbers_font_desc
+<a class="indexterm" name="id2617458"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_numbers_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the font to be used for the line numbers. This function
-might return <code class="literal">NULL</code> if a specific font for numbers has not been set.</p>
+might return <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if a specific font for numbers has not been set.</p>
<p>
</p>
@@ -976,7 +924,9 @@ might return <code class="literal">NULL<
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> the line numbers font description or <code class="literal">NULL</code>. This value is
+<td> the line numbers font description or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>. This value is
owned by the job and must not be modified or freed.
</td>
</tr>
@@ -985,24 +935,22 @@ owned by the job and must not be modifie
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592193"></a><h3>
+<a name="id2617540"></a><h3>
<a name="gtk-source-print-job-get-numbers-font"></a>gtk_source_print_job_get_numbers_font ()</h3>
-<a class="indexterm" name="id2592205"></a><pre class="programlisting">gchar* gtk_source_print_job_get_numbers_font
+<a class="indexterm" name="id2617552"></a><pre class="programlisting">gchar* gtk_source_print_job_get_numbers_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the font to be used for the line numbers. The returned
string is of the form "Fontfamily Style Size", for
example "Monospace Regular 10.0". The returned value
should be freed when no longer needed. This function might return
-<code class="literal">NULL</code> if a specific font for numbers has not been set.
+<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if a specific font for numbers has not been set.
</p>
<p>
-Note that the result is a <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> name not a Pango font
-description string. This function is deprecated since <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> is
+Note that the result is a <span class="type">GnomeFont</span> name not a Pango font
+description string. This function is deprecated since <span class="type">GnomeFont</span> is
no longer used when implementing printing for GtkSourceView; you
should use <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-numbers-font-desc"><code class="function">gtk_source_print_job_get_numbers_font_desc()</code></a> instead.</p>
<p>
@@ -1019,7 +967,9 @@ should use <a href="GtkSourcePrintJob.ht
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
<td> a newly allocated string with the name of the current
-line numbers font, or <code class="literal">NULL</code>.
+line numbers font, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -1027,9 +977,9 @@ line numbers font, or <code class="liter
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592318"></a><h3>
+<a name="id2617665"></a><h3>
<a name="gtk-source-print-job-set-print-numbers"></a>gtk_source_print_job_set_print_numbers ()</h3>
-<a class="indexterm" name="id2592331"></a><pre class="programlisting">void gtk_source_print_job_set_print_numbers
+<a class="indexterm" name="id2617678"></a><pre class="programlisting">void gtk_source_print_job_set_print_numbers
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
guint interval);</pre>
<p>
@@ -1057,9 +1007,9 @@ printed every <em class="parameter"><cod
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592426"></a><h3>
+<a name="id2617763"></a><h3>
<a name="gtk-source-print-job-get-print-numbers"></a>gtk_source_print_job_get_print_numbers ()</h3>
-<a class="indexterm" name="id2592441"></a><pre class="programlisting">guint gtk_source_print_job_get_print_numbers
+<a class="indexterm" name="id2617778"></a><pre class="programlisting">guint gtk_source_print_job_get_print_numbers
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the interval used for line number printing. If the
@@ -1086,9 +1036,9 @@ value is 0, no line numbers will be prin
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592513"></a><h3>
+<a name="id2617850"></a><h3>
<a name="gtk-source-print-job-set-text-margins"></a>gtk_source_print_job_set_text_margins ()</h3>
-<a class="indexterm" name="id2592527"></a><pre class="programlisting">void gtk_source_print_job_set_text_margins
+<a class="indexterm" name="id2617864"></a><pre class="programlisting">void gtk_source_print_job_set_text_margins
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gdouble top,
gdouble bottom,
@@ -1096,16 +1046,12 @@ value is 0, no line numbers will be prin
gdouble right);</pre>
<p>
Sets the four user margins for the print job. These margins are in
-addition to the document margins provided in the <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a>
+addition to the document margins provided in the <span class="type">GnomePrintConfig</span>
and will not be used for headers, footers or line numbers (those
are calculated separatedly). You can print in the space allocated
by these margins by connecting to the <a href="GtkSourcePrintJob.html#GtkSourcePrintJob-begin-page">"begin_page"</a> signal. The
space is around the printed text, and inside the margins specified
-in the <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
-><span class="type">GnomePrintConfig</span></a>.
+in the <span class="type">GnomePrintConfig</span>.
</p>
<p>
The margin numbers are given in device units. If any of the given
@@ -1147,9 +1093,9 @@ this function.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592704"></a><h3>
+<a name="id2618041"></a><h3>
<a name="gtk-source-print-job-get-text-margins"></a>gtk_source_print_job_get_text_margins ()</h3>
-<a class="indexterm" name="id2592718"></a><pre class="programlisting">void gtk_source_print_job_get_text_margins
+<a class="indexterm" name="id2618055"></a><pre class="programlisting">void gtk_source_print_job_get_text_margins
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gdouble *top,
gdouble *bottom,
@@ -1159,7 +1105,9 @@ this function.</p>
Determines the user set margins for the job. This function
retrieves the values previously set by
<a href="GtkSourcePrintJob.html#gtk-source-print-job-set-text-margins"><code class="function">gtk_source_print_job_set_text_margins()</code></a>. The default for all four
-margins is 0. Any of the pointers can be <code class="literal">NULL</code> if you want to
+margins is 0. Any of the pointers can be <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if you want to
ignore that value.</p>
<p>
@@ -1197,20 +1145,14 @@ ignore that value.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2592914"></a><h3>
+<a name="id2618250"></a><h3>
<a name="gtk-source-print-job-print"></a>gtk_source_print_job_print ()</h3>
-<a class="indexterm" name="id2592928"></a><pre class="programlisting"><a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
->GnomePrintJob</a>* gtk_source_print_job_print (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
-<p>
-Produces a <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> with the printed document. The whole
+<a class="indexterm" name="id2618265"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_print (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<p>
+Produces a <span class="type">GnomePrintJob</span> with the printed document. The whole
contents of the configured <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a> are printed. The
returned job is already closed and ready to be previewed (using
-<a
-href="../libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html#gnome-print-job-preview-new"
-><code class="function">gnome_print_job_preview_new()</code></a>) or printed directly. The caller of
+<code class="function">gnome_print_job_preview_new()</code>) or printed directly. The caller of
this function owns a reference to the returned object, so <em class="parameter"><code>job</code></em> can
be destroyed and the output will still be valid, or the document
can be printed again with different settings.</p>
@@ -1227,10 +1169,10 @@ can be printed again with different sett
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a closed <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> with the printed document, or
-<code class="literal">NULL</code> if printing could not be completed.
+<td> a closed <span class="type">GnomePrintJob</span> with the printed document, or
+<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if printing could not be completed.
</td>
</tr>
</tbody>
@@ -1238,11 +1180,9 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593050"></a><h3>
+<a name="id2618386"></a><h3>
<a name="gtk-source-print-job-print-range"></a>gtk_source_print_job_print_range ()</h3>
-<a class="indexterm" name="id2593064"></a><pre class="programlisting"><a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
->GnomePrintJob</a>* gtk_source_print_job_print_range
+<a class="indexterm" name="id2618400"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_print_range
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const GtkTextIter *start,
const GtkTextIter *end);</pre>
@@ -1273,10 +1213,10 @@ out of order.</p>
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a closed <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> with the text from <em class="parameter"><code>start</code></em> to
-<em class="parameter"><code>end</code></em> printed, or <code class="literal">NULL</code> if <em class="parameter"><code>job</code></em> could not print.
+<td> a closed <span class="type">GnomePrintJob</span> with the text from <em class="parameter"><code>start</code></em> to
+<em class="parameter"><code>end</code></em> printed, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if <em class="parameter"><code>job</code></em> could not print.
</td>
</tr>
</tbody>
@@ -1284,9 +1224,9 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593230"></a><h3>
+<a name="id2618566"></a><h3>
<a name="gtk-source-print-job-print-range-async"></a>gtk_source_print_job_print_range_async ()</h3>
-<a class="indexterm" name="id2593244"></a><pre class="programlisting">gboolean gtk_source_print_job_print_range_async
+<a class="indexterm" name="id2618581"></a><pre class="programlisting">gboolean gtk_source_print_job_print_range_async
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const GtkTextIter *start,
const GtkTextIter *end);</pre>
@@ -1305,9 +1245,7 @@ needs to be highlighted first.
To get notification when the job has finished, you must connect to
the <a href="GtkSourcePrintJob.html#GtkSourcePrintJob-finished">"finished"</a>
signal. After this signal is emitted you can retrieve the
-resulting <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> with <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-job"><code class="function">gtk_source_print_job_get_print_job()</code></a>.
+resulting <span class="type">GnomePrintJob</span> with <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-job"><code class="function">gtk_source_print_job_get_print_job()</code></a>.
You may cancel the job with <a href="GtkSourcePrintJob.html#gtk-source-print-job-cancel"><code class="function">gtk_source_print_job_cancel()</code></a>.</p>
<p>
@@ -1340,19 +1278,15 @@ You may cancel the job with <a href="Gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593428"></a><h3>
+<a name="id2618764"></a><h3>
<a name="gtk-source-print-job-cancel"></a>gtk_source_print_job_cancel ()</h3>
-<a class="indexterm" name="id2593442"></a><pre class="programlisting">void gtk_source_print_job_cancel (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2618778"></a><pre class="programlisting">void gtk_source_print_job_cancel (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Cancels an asynchronous printing operation. This will remove any
-pending print idle handler and unref the current <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a>.
+pending print idle handler and unref the current <span class="type">GnomePrintJob</span>.
</p>
<p>
-Note that if you got a reference to the job's <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> (using
+Note that if you got a reference to the job's <span class="type">GnomePrintJob</span> (using
<a href="GtkSourcePrintJob.html#gtk-source-print-job-get-print-job"><code class="function">gtk_source_print_job_get_print_job()</code></a>) it will not be destroyed
(since you hold a reference to it), but it will not be closed
either. If you wish to show or print the partially printed
@@ -1375,24 +1309,18 @@ print operation.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593538"></a><h3>
+<a name="id2618874"></a><h3>
<a name="gtk-source-print-job-get-print-job"></a>gtk_source_print_job_get_print_job ()</h3>
-<a class="indexterm" name="id2593553"></a><pre class="programlisting"><a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
->GnomePrintJob</a>* gtk_source_print_job_get_print_job
+<a class="indexterm" name="id2618889"></a><pre class="programlisting">GnomePrintJob* gtk_source_print_job_get_print_job
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
-Gets a reference to the <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> which the <em class="parameter"><code>job</code></em> is printing
+Gets a reference to the <span class="type">GnomePrintJob</span> which the <em class="parameter"><code>job</code></em> is printing
or has recently finished printing. You need to unref the returned
object.
</p>
<p>
You may call this function in the middle of an asynchronous
-printing operation, but the returned <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> will not be
+printing operation, but the returned <span class="type">GnomePrintJob</span> will not be
closed until the last page is printed and the <a href="GtkSourcePrintJob.html#GtkSourcePrintJob-finished">"finished"</a>
signal is emitted.</p>
<p>
@@ -1408,10 +1336,10 @@ signal is emitted.</p>
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a new reference to the <em class="parameter"><code>job</code></em>'s <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a>, or
-<code class="literal">NULL</code>.
+<td> a new reference to the <em class="parameter"><code>job</code></em>'s <span class="type">GnomePrintJob</span>, or
+<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -1419,9 +1347,9 @@ href="../libgnomeprint/libgnomeprint-gno
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593679"></a><h3>
+<a name="id2619015"></a><h3>
<a name="gtk-source-print-job-get-page"></a>gtk_source_print_job_get_page ()</h3>
-<a class="indexterm" name="id2593693"></a><pre class="programlisting">guint gtk_source_print_job_get_page (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
+<a class="indexterm" name="id2619030"></a><pre class="programlisting">guint gtk_source_print_job_get_page (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the currently printing page number. This function is
only valid while printing (either synchronously or asynchronously).</p>
@@ -1446,9 +1374,9 @@ only valid while printing (either synchr
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593764"></a><h3>
+<a name="id2619100"></a><h3>
<a name="gtk-source-print-job-get-page-count"></a>gtk_source_print_job_get_page_count ()</h3>
-<a class="indexterm" name="id2593778"></a><pre class="programlisting">guint gtk_source_print_job_get_page_count
+<a class="indexterm" name="id2619115"></a><pre class="programlisting">guint gtk_source_print_job_get_page_count
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the total number of pages the job will print. The
@@ -1477,16 +1405,12 @@ returned.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593867"></a><h3>
+<a name="id2619204"></a><h3>
<a name="gtk-source-print-job-get-print-context"></a>gtk_source_print_job_get_print_context ()</h3>
-<a class="indexterm" name="id2593882"></a><pre class="programlisting"><a
-href="../libgnomeprint/libgnomeprint-gnome-print.html#GnomePrintContext"
->GnomePrintContext</a>* gtk_source_print_job_get_print_context
+<a class="indexterm" name="id2619218"></a><pre class="programlisting">GnomePrintContext* gtk_source_print_job_get_print_context
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
-Determines the <a
-href="../libgnomeprint/libgnomeprint-gnome-print.html#GnomePrintContext"
-><span class="type">GnomePrintContext</span></a> of the current job. This
+Determines the <span class="type">GnomePrintContext</span> of the current job. This
function is only valid while printing. Normally you would use this
function to print in the margins set by
<code class="function">gtk_source_print_job_set_margins()</code> in a handler for the <a href="GtkSourcePrintJob.html#GtkSourcePrintJob-begin-page">"begin_page"</a>
@@ -1504,9 +1428,7 @@ signal.</p>
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> the current <a
-href="../libgnomeprint/libgnomeprint-gnome-print.html#GnomePrintContext"
-><span class="type">GnomePrintContext</span></a>. The returned object
+<td> the current <span class="type">GnomePrintContext</span>. The returned object
is owned by <em class="parameter"><code>job</code></em>.
</td>
</tr>
@@ -1515,9 +1437,9 @@ is owned by <em class="parameter"><code>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2593992"></a><h3>
+<a name="id2619328"></a><h3>
<a name="gtk-source-print-job-set-print-header"></a>gtk_source_print_job_set_print_header ()</h3>
-<a class="indexterm" name="id2594006"></a><pre class="programlisting">void gtk_source_print_job_set_print_header
+<a class="indexterm" name="id2619342"></a><pre class="programlisting">void gtk_source_print_job_set_print_header
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gboolean setting);</pre>
<p>
@@ -1550,9 +1472,9 @@ empty it will not be printed, regardless
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594114"></a><h3>
+<a name="id2619450"></a><h3>
<a name="gtk-source-print-job-get-print-header"></a>gtk_source_print_job_get_print_header ()</h3>
-<a class="indexterm" name="id2594128"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_header
+<a class="indexterm" name="id2619465"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_header
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines if a header is set to be printed for each page. A
@@ -1580,9 +1502,9 @@ with <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594233"></a><h3>
+<a name="id2619570"></a><h3>
<a name="gtk-source-print-job-set-print-footer"></a>gtk_source_print_job_set_print_footer ()</h3>
-<a class="indexterm" name="id2594247"></a><pre class="programlisting">void gtk_source_print_job_set_print_footer
+<a class="indexterm" name="id2619584"></a><pre class="programlisting">void gtk_source_print_job_set_print_footer
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
gboolean setting);</pre>
<p>
@@ -1615,9 +1537,9 @@ empty it will not be printed, regardless
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594355"></a><h3>
+<a name="id2619692"></a><h3>
<a name="gtk-source-print-job-get-print-footer"></a>gtk_source_print_job_get_print_footer ()</h3>
-<a class="indexterm" name="id2594370"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_footer
+<a class="indexterm" name="id2619706"></a><pre class="programlisting">gboolean gtk_source_print_job_get_print_footer
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines if a footer is set to be printed for each page. A
@@ -1645,13 +1567,15 @@ with <a href="GtkSourcePrintJob.html#gtk
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594474"></a><h3>
+<a name="id2619811"></a><h3>
<a name="gtk-source-print-job-set-header-footer-font-desc"></a>gtk_source_print_job_set_header_footer_font_desc ()</h3>
-<a class="indexterm" name="id2594489"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font_desc
+<a class="indexterm" name="id2619826"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
PangoFontDescription *desc);</pre>
<p>
-Sets the font for printing headers and footers. If <code class="literal">NULL</code> is
+Sets the font for printing headers and footers. If <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> is
supplied, the default font (i.e. the one being used for the text)
will be used instead.</p>
<p>
@@ -1667,7 +1591,9 @@ will be used instead.</p>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>desc</code></em> :</span></td>
-<td> the <span class="type">PangoFontDescription</span> for the font to be used in headers and footers, or <code class="literal">NULL</code>.
+<td> the <span class="type">PangoFontDescription</span> for the font to be used in headers and footers, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -1675,23 +1601,21 @@ will be used instead.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594599"></a><h3>
+<a name="id2619936"></a><h3>
<a name="gtk-source-print-job-set-header-footer-font"></a>gtk_source_print_job_set_header_footer_font ()</h3>
-<a class="indexterm" name="id2594614"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font
+<a class="indexterm" name="id2619951"></a><pre class="programlisting">void gtk_source_print_job_set_header_footer_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *font_name);</pre>
<p>
-Sets the font for printing headers and footers. If <code class="literal">NULL</code> is
+Sets the font for printing headers and footers. If <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> is
supplied, the default font (i.e. the one being used for the text)
will be used instead.
</p>
<p>
-Note that <em class="parameter"><code>font_name</code></em> is a <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> name not a Pango font
-description string. This function is deprecated since <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> is
+Note that <em class="parameter"><code>font_name</code></em> is a <span class="type">GnomeFont</span> name not a Pango font
+description string. This function is deprecated since <span class="type">GnomeFont</span> is
no longer used when implementing printing for GtkSourceView; you
should use <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-header-footer-font-desc"><code class="function">gtk_source_print_job_set_header_footer_font_desc()</code></a> instead.</p>
<p>
@@ -1707,7 +1631,9 @@ should use <a href="GtkSourcePrintJob.ht
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>font_name</code></em> :</span></td>
-<td> the full name of the font to be used in headers and footers, or <code class="literal">NULL</code>.
+<td> the full name of the font to be used in headers and footers, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -1715,13 +1641,15 @@ should use <a href="GtkSourcePrintJob.ht
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594752"></a><h3>
+<a name="id2620088"></a><h3>
<a name="gtk-source-print-job-get-header-footer-font-desc"></a>gtk_source_print_job_get_header_footer_font_desc ()</h3>
-<a class="indexterm" name="id2594766"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_header_footer_font_desc
+<a class="indexterm" name="id2620103"></a><pre class="programlisting">PangoFontDescription* gtk_source_print_job_get_header_footer_font_desc
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the font to be used for the header and footer. This function
-might return <code class="literal">NULL</code> if a specific font has not been set.</p>
+might return <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if a specific font has not been set.</p>
<p>
</p>
@@ -1735,7 +1663,9 @@ might return <code class="literal">NULL<
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> the header and footer font description or <code class="literal">NULL</code>. This value is
+<td> the header and footer font description or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>. This value is
owned by the job and must not be modified or freed.
</td>
</tr>
@@ -1744,24 +1674,22 @@ owned by the job and must not be modifie
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594858"></a><h3>
+<a name="id2620195"></a><h3>
<a name="gtk-source-print-job-get-header-footer-font"></a>gtk_source_print_job_get_header_footer_font ()</h3>
-<a class="indexterm" name="id2594873"></a><pre class="programlisting">gchar* gtk_source_print_job_get_header_footer_font
+<a class="indexterm" name="id2620210"></a><pre class="programlisting">gchar* gtk_source_print_job_get_header_footer_font
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job);</pre>
<p>
Determines the font to be used for the header and footer. The
returned string is of the form "Fontfamily Style Size",
for example "Monospace Regular 10.0". The returned value
should be freed when no longer needed. This function might return
-<code class="literal">NULL</code> if a specific font has not been set.
+<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if a specific font has not been set.
</p>
<p>
-Note that the result is a <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> name not a Pango font
-description string. This function is deprecated since <a
-href="../libgnomeprint/libgnomeprint-gnome-font.html#GnomeFont"
-><span class="type">GnomeFont</span></a> is
+Note that the result is a <span class="type">GnomeFont</span> name not a Pango font
+description string. This function is deprecated since <span class="type">GnomeFont</span> is
no longer used when implementing printing for GtkSourceView; you
should use <a href="GtkSourcePrintJob.html#gtk-source-print-job-get-header-footer-font-desc"><code class="function">gtk_source_print_job_get_header_footer_font_desc()</code></a> instead.</p>
<p>
@@ -1778,7 +1706,9 @@ should use <a href="GtkSourcePrintJob.ht
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
<td> a newly allocated string with the name of the current
-header and footer font, or <code class="literal">NULL</code>.
+header and footer font, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
</tbody>
@@ -1786,9 +1716,9 @@ header and footer font, or <code class="
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2594997"></a><h3>
+<a name="id2620334"></a><h3>
<a name="gtk-source-print-job-set-header-format"></a>gtk_source_print_job_set_header_format ()</h3>
-<a class="indexterm" name="id2595012"></a><pre class="programlisting">void gtk_source_print_job_set_header_format
+<a class="indexterm" name="id2620348"></a><pre class="programlisting">void gtk_source_print_job_set_header_format
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *left,
const gchar *center,
@@ -1806,7 +1736,9 @@ page number and <code class="literal">Q<
the header from the document text.
</p>
<p>
-If <code class="literal">NULL</code> is given for any of the three arguments, that particular
+If <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> is given for any of the three arguments, that particular
string will not be printed. For the header to be printed, in
addition to specifying format strings, you need to enable header
printing with <a href="GtkSourcePrintJob.html#gtk-source-print-job-set-print-header"><code class="function">gtk_source_print_job_set_print_header()</code></a>.</p>
@@ -1846,9 +1778,9 @@ printing with <a href="GtkSourcePrintJob
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595237"></a><h3>
+<a name="id2620574"></a><h3>
<a name="gtk-source-print-job-set-footer-format"></a>gtk_source_print_job_set_footer_format ()</h3>
-<a class="indexterm" name="id2595252"></a><pre class="programlisting">void gtk_source_print_job_set_footer_format
+<a class="indexterm" name="id2620588"></a><pre class="programlisting">void gtk_source_print_job_set_footer_format
(<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *job,
const gchar *left,
const gchar *center,
@@ -1892,124 +1824,122 @@ Like <a href="GtkSourcePrintJob.html#gtk
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2595419"></a><h2>Property Details</h2>
+<a name="id2620756"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2595430"></a><h3>
+<a name="id2620767"></a><h3>
<a name="GtkSourcePrintJob--buffer"></a>The "<code class="literal">buffer</code>" property</h3>
-<a class="indexterm" name="id2595446"></a><pre class="programlisting"> "buffer" <a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> : Read / Write</pre>
+<a class="indexterm" name="id2620783"></a><pre class="programlisting"> "buffer" <a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> : Read / Write</pre>
<p>GtkSourceBuffer object to print.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595469"></a><h3>
+<a name="id2620806"></a><h3>
<a name="GtkSourcePrintJob--config"></a>The "<code class="literal">config</code>" property</h3>
-<a class="indexterm" name="id2595485"></a><pre class="programlisting"> "config" <a
-href="../libgnomeprint/libgnomeprint-gnome-print-config.html#GnomePrintConfig"
->GnomePrintConfig</a> : Read / Write</pre>
+<a class="indexterm" name="id2620822"></a><pre class="programlisting"> "config" GnomePrintConfig : Read / Write</pre>
<p>Configuration options for the print job.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595508"></a><h3>
+<a name="id2620845"></a><h3>
<a name="GtkSourcePrintJob--font"></a>The "<code class="literal">font</code>" property</h3>
-<a class="indexterm" name="id2595524"></a><pre class="programlisting"> "font" gchararray : Read / Write</pre>
+<a class="indexterm" name="id2620861"></a><pre class="programlisting"> "font" gchararray : Read / Write</pre>
<p>GnomeFont name to use for the document text (deprecated).</p>
<p>Default value: NULL</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595551"></a><h3>
+<a name="id2620887"></a><h3>
<a name="GtkSourcePrintJob--font-desc"></a>The "<code class="literal">font-desc</code>" property</h3>
-<a class="indexterm" name="id2595567"></a><pre class="programlisting"> "font-desc" PangoFontDescription : Read / Write</pre>
+<a class="indexterm" name="id2620904"></a><pre class="programlisting"> "font-desc" PangoFontDescription : Read / Write</pre>
<p>Font to use for the document text (e.g. "Monospace 10").</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595591"></a><h3>
+<a name="id2620927"></a><h3>
<a name="GtkSourcePrintJob--header-footer-font"></a>The "<code class="literal">header-footer-font</code>" property</h3>
-<a class="indexterm" name="id2595608"></a><pre class="programlisting"> "header-footer-font" gchararray : Read / Write</pre>
+<a class="indexterm" name="id2620944"></a><pre class="programlisting"> "header-footer-font" gchararray : Read / Write</pre>
<p>GnomeFont name to use for the header and footer (deprecated).</p>
<p>Default value: NULL</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595634"></a><h3>
+<a name="id2620971"></a><h3>
<a name="GtkSourcePrintJob--header-footer-font-desc"></a>The "<code class="literal">header-footer-font-desc</code>" property</h3>
-<a class="indexterm" name="id2595652"></a><pre class="programlisting"> "header-footer-font-desc" PangoFontDescription : Read / Write</pre>
+<a class="indexterm" name="id2620988"></a><pre class="programlisting"> "header-footer-font-desc" PangoFontDescription : Read / Write</pre>
<p>Font to use for headers and footers (e.g. "Monospace 10").</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595674"></a><h3>
+<a name="id2621011"></a><h3>
<a name="GtkSourcePrintJob--highlight"></a>The "<code class="literal">highlight</code>" property</h3>
-<a class="indexterm" name="id2595691"></a><pre class="programlisting"> "highlight" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2621027"></a><pre class="programlisting"> "highlight" gboolean : Read / Write</pre>
<p>Whether to print the document with highlighted syntax.</p>
<p>Default value: TRUE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595717"></a><h3>
+<a name="id2621054"></a><h3>
<a name="GtkSourcePrintJob--numbers-font"></a>The "<code class="literal">numbers-font</code>" property</h3>
-<a class="indexterm" name="id2595734"></a><pre class="programlisting"> "numbers-font" gchararray : Read / Write</pre>
+<a class="indexterm" name="id2621071"></a><pre class="programlisting"> "numbers-font" gchararray : Read / Write</pre>
<p>GnomeFont name to use for the line numbers (deprecated).</p>
<p>Default value: NULL</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595761"></a><h3>
+<a name="id2621098"></a><h3>
<a name="GtkSourcePrintJob--numbers-font-desc"></a>The "<code class="literal">numbers-font-desc</code>" property</h3>
-<a class="indexterm" name="id2595778"></a><pre class="programlisting"> "numbers-font-desc" PangoFontDescription : Read / Write</pre>
+<a class="indexterm" name="id2621114"></a><pre class="programlisting"> "numbers-font-desc" PangoFontDescription : Read / Write</pre>
<p>Font description to use for the line numbers.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595801"></a><h3>
+<a name="id2621138"></a><h3>
<a name="GtkSourcePrintJob--print-footer"></a>The "<code class="literal">print-footer</code>" property</h3>
-<a class="indexterm" name="id2595818"></a><pre class="programlisting"> "print-footer" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2621155"></a><pre class="programlisting"> "print-footer" gboolean : Read / Write</pre>
<p>Whether to print a footer in each page.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595844"></a><h3>
+<a name="id2621180"></a><h3>
<a name="GtkSourcePrintJob--print-header"></a>The "<code class="literal">print-header</code>" property</h3>
-<a class="indexterm" name="id2595861"></a><pre class="programlisting"> "print-header" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2621197"></a><pre class="programlisting"> "print-header" gboolean : Read / Write</pre>
<p>Whether to print a header in each page.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595887"></a><h3>
+<a name="id2621224"></a><h3>
<a name="GtkSourcePrintJob--print-numbers"></a>The "<code class="literal">print-numbers</code>" property</h3>
-<a class="indexterm" name="id2595904"></a><pre class="programlisting"> "print-numbers" guint : Read / Write</pre>
+<a class="indexterm" name="id2621240"></a><pre class="programlisting"> "print-numbers" guint : Read / Write</pre>
<p>Interval of printed line numbers (0 means no numbers).</p>
<p>Allowed values: <= 100</p>
<p>Default value: 1</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595934"></a><h3>
+<a name="id2621271"></a><h3>
<a name="GtkSourcePrintJob--tabs-width"></a>The "<code class="literal">tabs-width</code>" property</h3>
-<a class="indexterm" name="id2595951"></a><pre class="programlisting"> "tabs-width" guint : Read / Write</pre>
+<a class="indexterm" name="id2621288"></a><pre class="programlisting"> "tabs-width" guint : Read / Write</pre>
<p>Width in equivalent space characters of tabs.</p>
<p>Allowed values: <= 100</p>
<p>Default value: 8</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2595982"></a><h3>
+<a name="id2621319"></a><h3>
<a name="GtkSourcePrintJob--wrap-mode"></a>The "<code class="literal">wrap-mode</code>" property</h3>
-<a class="indexterm" name="id2595999"></a><pre class="programlisting"> "wrap-mode" GtkWrapMode : Read / Write</pre>
+<a class="indexterm" name="id2621336"></a><pre class="programlisting"> "wrap-mode" GtkWrapMode : Read / Write</pre>
<p>Word wrapping mode.</p>
<p>Default value: GTK_WRAP_NONE</p>
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2596026"></a><h2>Signal Details</h2>
+<a name="id2621363"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2596037"></a><h3>
+<a name="id2621374"></a><h3>
<a name="GtkSourcePrintJob-begin-page"></a>The "begin-page" signal</h3>
-<a class="indexterm" name="id2596048"></a><pre class="programlisting">void user_function (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *sourceprintjob,
+<a class="indexterm" name="id2621384"></a><pre class="programlisting">void user_function (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *sourceprintjob,
gpointer user_data) : Run last</pre>
<p>
Emitted whenever the <em class="parameter"><code>sourceprintjob</code></em> is about to print a new text
@@ -2035,16 +1965,14 @@ page by for example, printing your own h
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2596125"></a><h3>
+<a name="id2621462"></a><h3>
<a name="GtkSourcePrintJob-finished"></a>The "finished" signal</h3>
-<a class="indexterm" name="id2596135"></a><pre class="programlisting">void user_function (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *sourceprintjob,
+<a class="indexterm" name="id2621472"></a><pre class="programlisting">void user_function (<a href="GtkSourcePrintJob.html" title="GtkSourcePrintJob">GtkSourcePrintJob</a> *sourceprintjob,
gpointer user_data) : Run first</pre>
<p>
Emitted whenever an asynchronous print job has finished. You can
connect to this signal to get notification when a job has finished
-printing. When it's emitted, the <a
-href="../libgnomeprint/libgnomeprint-gnome-print-job.html#GnomePrintJob"
-><span class="type">GnomePrintJob</span></a> the <em class="parameter"><code>sourceprintjob</code></em>
+printing. When it's emitted, the <span class="type">GnomePrintJob</span> the <em class="parameter"><code>sourceprintjob</code></em>
was producing has been closed and it can be either previewed or
printed to the physical device.
</p>
@@ -2066,7 +1994,7 @@ printed to the physical device.
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2596224"></a><h2>See Also</h2>
+<a name="id2621560"></a><h2>See Also</h2>
<p>
The reference documentation for <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a>. You might also want
to check the Gnome Print library reference
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceStyleScheme.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceStyleScheme.html
--- 1.8.2-1/docs/reference/html/GtkSourceStyleScheme.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceStyleScheme.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceStyleScheme</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceLanguagesManager.html" title="GtkSourceLanguagesManager">
@@ -21,22 +21,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceTag.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2529429" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2579757" class="shortcut">Top</a>
 | 
- <a href="#id2535883" class="shortcut">Description</a>
+ <a href="#id2555399" class="shortcut">Description</a>
 | 
- <a href="#id2535809" class="shortcut">Object Hierarchy</a>
+ <a href="#id2555325" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2535833" class="shortcut">Signals</a></nobr></td></tr>
+ <a href="#id2555349" class="shortcut">Signals</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceStyleScheme"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2529429"></a><span class="refentrytitle">GtkSourceStyleScheme</span>
+<a name="id2579757"></a><span class="refentrytitle">GtkSourceStyleScheme</span>
</h2>
-<p>GtkSourceStyleScheme — </p>
+<p>GtkSourceStyleScheme</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -60,7 +60,7 @@ const gchar* <a href="GtkSourceStyleSche
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2535809"></a><h2>Object Hierarchy</h2>
+<a name="id2555325"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GInterface
@@ -68,7 +68,7 @@ const gchar* <a href="GtkSourceStyleSche
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2535833"></a><h2>Signals</h2>
+<a name="id2555349"></a><h2>Signals</h2>
<pre class="synopsis">
"<a href="GtkSourceStyleScheme.html#GtkSourceStyleScheme-style-changed">style-changed</a>"
@@ -78,26 +78,26 @@ const gchar* <a href="GtkSourceStyleSche
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2535883"></a><h2>Description</h2>
+<a name="id2555399"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2535899"></a><h2>Details</h2>
+<a name="id2555415"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2535910"></a><h3>
+<a name="id2555425"></a><h3>
<a name="GtkSourceStyleScheme-struct"></a>GtkSourceStyleScheme</h3>
-<a class="indexterm" name="id2527468"></a><pre class="programlisting">typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme;</pre>
+<a class="indexterm" name="id2553682"></a><pre class="programlisting">typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527484"></a><h3>
+<a name="id2553698"></a><h3>
<a name="GtkSourceStyleSchemeClass"></a>GtkSourceStyleSchemeClass</h3>
-<a class="indexterm" name="id2527495"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2553710"></a><pre class="programlisting">typedef struct {
GTypeInterface base_iface;
/* signals */
@@ -123,9 +123,9 @@ const gchar* <a href="GtkSourceStyleSche
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2546543"></a><h3>
+<a name="id2560055"></a><h3>
<a name="gtk-source-style-scheme-get-tag-style"></a>gtk_source_style_scheme_get_tag_style ()</h3>
-<a class="indexterm" name="id2528506"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_style_scheme_get_tag_style
+<a class="indexterm" name="id2572430"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_style_scheme_get_tag_style
(<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *scheme,
const gchar *style_name);</pre>
<p>
@@ -156,9 +156,9 @@ Gets the tag associated with the given <
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527603"></a><h3>
+<a name="id2553816"></a><h3>
<a name="gtk-source-style-scheme-get-name"></a>gtk_source_style_scheme_get_name ()</h3>
-<a class="indexterm" name="id2527614"></a><pre class="programlisting">const gchar* gtk_source_style_scheme_get_name
+<a class="indexterm" name="id2553827"></a><pre class="programlisting">const gchar* gtk_source_style_scheme_get_name
(<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *scheme);</pre>
<p>
Gets the name of the given style <em class="parameter"><code>scheme</code></em>.</p>
@@ -183,9 +183,9 @@ Gets the name of the given style <em cla
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527687"></a><h3>
+<a name="id2552730"></a><h3>
<a name="gtk-source-style-scheme-get-default"></a>gtk_source_style_scheme_get_default ()</h3>
-<a class="indexterm" name="id2527699"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_style_scheme_get_default
+<a class="indexterm" name="id2552744"></a><pre class="programlisting"><a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a>* gtk_source_style_scheme_get_default
(void);</pre>
<p>
Gets the default style scheme.</p>
@@ -203,11 +203,11 @@ Gets the default style scheme.</p>
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2527087"></a><h2>Signal Details</h2>
+<a name="id2552792"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2527098"></a><h3>
+<a name="id2552803"></a><h3>
<a name="GtkSourceStyleScheme-style-changed"></a>The "style-changed" signal</h3>
-<a class="indexterm" name="id2527107"></a><pre class="programlisting">void user_function (<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *sourcestylescheme,
+<a class="indexterm" name="id2552812"></a><pre class="programlisting">void user_function (<a href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">GtkSourceStyleScheme</a> *sourcestylescheme,
gchar *arg1,
gpointer user_data) : Run last</pre>
<p>
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceTag.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceTag.html
--- 1.8.2-1/docs/reference/html/GtkSourceTag.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceTag.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceTag</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceStyleScheme.html" title="GtkSourceStyleScheme">
@@ -21,22 +21,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceTagTable.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2553337" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2592732" class="shortcut">Top</a>
 | 
- <a href="#id2578009" class="shortcut">Description</a>
+ <a href="#id2553294" class="shortcut">Description</a>
 | 
- <a href="#id2527032" class="shortcut">Object Hierarchy</a>
+ <a href="#id2599641" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2577966" class="shortcut">Properties</a></nobr></td></tr>
+ <a href="#id2553251" class="shortcut">Properties</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceTag"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2553337"></a><span class="refentrytitle">GtkSourceTag</span>
+<a name="id2592732"></a><span class="refentrytitle">GtkSourceTag</span>
</h2>
-<p>GtkSourceTag — </p>
+<p>GtkSourceTag</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -84,7 +84,7 @@ GtkTextTag* <a href="GtkSourceTag.html#g
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2527032"></a><h2>Object Hierarchy</h2>
+<a name="id2599641"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -109,7 +109,7 @@ GtkTextTag* <a href="GtkSourceTag.html#g
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2577966"></a><h2>Properties</h2>
+<a name="id2553251"></a><h2>Properties</h2>
<pre class="synopsis">
"<a href="GtkSourceTag.html#GtkSourceTag--id">id</a>" gchararray : Read / Write / Construct Only
@@ -117,71 +117,71 @@ GtkTextTag* <a href="GtkSourceTag.html#g
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2578009"></a><h2>Description</h2>
+<a name="id2553294"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2578025"></a><h2>Details</h2>
+<a name="id2553310"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2578036"></a><h3>
+<a name="id2553321"></a><h3>
<a name="GtkSourceTag-struct"></a>GtkSourceTag</h3>
-<a class="indexterm" name="id2578048"></a><pre class="programlisting">typedef struct _GtkSourceTag GtkSourceTag;</pre>
+<a class="indexterm" name="id2553333"></a><pre class="programlisting">typedef struct _GtkSourceTag GtkSourceTag;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2578064"></a><h3>
+<a name="id2553348"></a><h3>
<a name="GtkSourceTagClass"></a>GtkSourceTagClass</h3>
-<a class="indexterm" name="id2578076"></a><pre class="programlisting">typedef struct _GtkSourceTagClass GtkSourceTagClass;</pre>
+<a class="indexterm" name="id2553361"></a><pre class="programlisting">typedef struct _GtkSourceTagClass GtkSourceTagClass;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2578092"></a><h3>
+<a name="id2553377"></a><h3>
<a name="GtkSyntaxTag-struct"></a>GtkSyntaxTag</h3>
-<a class="indexterm" name="id2578105"></a><pre class="programlisting">typedef struct _GtkSyntaxTag GtkSyntaxTag;</pre>
+<a class="indexterm" name="id2553390"></a><pre class="programlisting">typedef struct _GtkSyntaxTag GtkSyntaxTag;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2578120"></a><h3>
+<a name="id2553405"></a><h3>
<a name="GtkSyntaxTagClass"></a>GtkSyntaxTagClass</h3>
-<a class="indexterm" name="id2578133"></a><pre class="programlisting">typedef struct _GtkSyntaxTagClass GtkSyntaxTagClass;</pre>
+<a class="indexterm" name="id2553418"></a><pre class="programlisting">typedef struct _GtkSyntaxTagClass GtkSyntaxTagClass;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2578149"></a><h3>
+<a name="id2553434"></a><h3>
<a name="GtkPatternTag-struct"></a>GtkPatternTag</h3>
-<a class="indexterm" name="id2574326"></a><pre class="programlisting">typedef struct _GtkPatternTag GtkPatternTag;</pre>
+<a class="indexterm" name="id2589616"></a><pre class="programlisting">typedef struct _GtkPatternTag GtkPatternTag;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574342"></a><h3>
+<a name="id2589632"></a><h3>
<a name="GtkPatternTagClass"></a>GtkPatternTagClass</h3>
-<a class="indexterm" name="id2574355"></a><pre class="programlisting">typedef struct _GtkPatternTagClass GtkPatternTagClass;</pre>
+<a class="indexterm" name="id2589645"></a><pre class="programlisting">typedef struct _GtkPatternTagClass GtkPatternTagClass;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574371"></a><h3>
+<a name="id2589661"></a><h3>
<a name="gtk-source-tag-get-style"></a>gtk_source_tag_get_style ()</h3>
-<a class="indexterm" name="id2574383"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_get_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag);</pre>
+<a class="indexterm" name="id2589673"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_get_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag);</pre>
<p>
Gets the style associated with the given <em class="parameter"><code>tag</code></em>.</p>
<p>
@@ -197,7 +197,9 @@ Gets the style associated with the given
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle"><span class="type">GtkSourceTagStyle</span></a> if found, or <code class="literal">NULL</code> if not found.
+<td> a <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle"><span class="type">GtkSourceTagStyle</span></a> if found, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if not found.
</td>
</tr>
</tbody>
@@ -205,9 +207,9 @@ Gets the style associated with the given
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574472"></a><h3>
+<a name="id2589762"></a><h3>
<a name="gtk-source-tag-set-style"></a>gtk_source_tag_set_style ()</h3>
-<a class="indexterm" name="id2574483"></a><pre class="programlisting">void gtk_source_tag_set_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag,
+<a class="indexterm" name="id2589773"></a><pre class="programlisting">void gtk_source_tag_set_style (<a href="GtkSourceTag.html" title="GtkSourceTag">GtkSourceTag</a> *tag,
const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
Associates a given <em class="parameter"><code>style</code></em> with the given <em class="parameter"><code>tag</code></em>.</p>
@@ -232,9 +234,9 @@ Associates a given <em class="parameter"
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574580"></a><h3>
+<a name="id2589870"></a><h3>
<a name="gtk-syntax-tag-new"></a>gtk_syntax_tag_new ()</h3>
-<a class="indexterm" name="id2579832"></a><pre class="programlisting">GtkTextTag* gtk_syntax_tag_new (const gchar *id,
+<a class="indexterm" name="id2605183"></a><pre class="programlisting">GtkTextTag* gtk_syntax_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern_start,
const gchar *pattern_end);</pre>
@@ -276,9 +278,9 @@ Creates a new syntax tag object with the
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2579921"></a><h3>
+<a name="id2605300"></a><h3>
<a name="gtk-pattern-tag-new"></a>gtk_pattern_tag_new ()</h3>
-<a class="indexterm" name="id2579931"></a><pre class="programlisting">GtkTextTag* gtk_pattern_tag_new (const gchar *id,
+<a class="indexterm" name="id2605310"></a><pre class="programlisting">GtkTextTag* gtk_pattern_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern);</pre>
<p>
@@ -314,9 +316,9 @@ Creates a new pattern tag object with th
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2580029"></a><h3>
+<a name="id2605416"></a><h3>
<a name="gtk-keyword-list-tag-new"></a>gtk_keyword_list_tag_new ()</h3>
-<a class="indexterm" name="id2580039"></a><pre class="programlisting">GtkTextTag* gtk_keyword_list_tag_new (const gchar *id,
+<a class="indexterm" name="id2605427"></a><pre class="programlisting">GtkTextTag* gtk_keyword_list_tag_new (const gchar *id,
const gchar *name,
const GSList *keywords,
gboolean case_sensitive,
@@ -384,9 +386,9 @@ string at the end.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2580237"></a><h3>
+<a name="id2605644"></a><h3>
<a name="gtk-block-comment-tag-new"></a>gtk_block_comment_tag_new</h3>
-<a class="indexterm" name="id2580247"></a><pre class="programlisting">#define gtk_block_comment_tag_new gtk_syntax_tag_new
+<a class="indexterm" name="id2605656"></a><pre class="programlisting">#define gtk_block_comment_tag_new gtk_syntax_tag_new
</pre>
<p>
@@ -394,9 +396,9 @@ string at the end.
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2580262"></a><h3>
+<a name="id2605672"></a><h3>
<a name="gtk-line-comment-tag-new"></a>gtk_line_comment_tag_new ()</h3>
-<a class="indexterm" name="id2580272"></a><pre class="programlisting">GtkTextTag* gtk_line_comment_tag_new (const gchar *id,
+<a class="indexterm" name="id2605683"></a><pre class="programlisting">GtkTextTag* gtk_line_comment_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern_start);</pre>
<p>
@@ -432,9 +434,9 @@ Creates a new line comment tag object wi
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2580371"></a><h3>
+<a name="id2605793"></a><h3>
<a name="gtk-string-tag-new"></a>gtk_string_tag_new ()</h3>
-<a class="indexterm" name="id2580381"></a><pre class="programlisting">GtkTextTag* gtk_string_tag_new (const gchar *id,
+<a class="indexterm" name="id2605805"></a><pre class="programlisting">GtkTextTag* gtk_string_tag_new (const gchar *id,
const gchar *name,
const gchar *pattern_start,
const gchar *pattern_end,
@@ -482,19 +484,19 @@ Creates a new string tag object with the
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2580521"></a><h2>Property Details</h2>
+<a name="id2605959"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2580530"></a><h3>
+<a name="id2605970"></a><h3>
<a name="GtkSourceTag--id"></a>The "<code class="literal">id</code>" property</h3>
-<a class="indexterm" name="id2580543"></a><pre class="programlisting"> "id" gchararray : Read / Write / Construct Only</pre>
+<a class="indexterm" name="id2605985"></a><pre class="programlisting"> "id" gchararray : Read / Write / Construct Only</pre>
<p>ID used to refer to the source tag.</p>
<p>Default value: NULL</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2580566"></a><h3>
+<a name="id2606011"></a><h3>
<a name="GtkSourceTag--tag-style"></a>The "<code class="literal">tag-style</code>" property</h3>
-<a class="indexterm" name="id2580578"></a><pre class="programlisting"> "tag-style" <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> : Read / Write</pre>
+<a class="indexterm" name="id2606025"></a><pre class="programlisting"> "tag-style" <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> : Read / Write</pre>
<p>The style associated with the source tag.</p>
</div>
</div>
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceTagTable.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceTagTable.html
--- 1.8.2-1/docs/reference/html/GtkSourceTagTable.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceTagTable.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceTagTable</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceTag.html" title="GtkSourceTag">
@@ -21,22 +21,22 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="gtksourceview-GtkSourceTagStyle.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2532154" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2582466" class="shortcut">Top</a>
 | 
- <a href="#id2566256" class="shortcut">Description</a>
+ <a href="#id2550804" class="shortcut">Description</a>
 | 
- <a href="#id2566183" class="shortcut">Object Hierarchy</a>
+ <a href="#id2550731" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2566214" class="shortcut">Signals</a></nobr></td></tr>
+ <a href="#id2550761" class="shortcut">Signals</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceTagTable"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2532154"></a><span class="refentrytitle">GtkSourceTagTable</span>
+<a name="id2582466"></a><span class="refentrytitle">GtkSourceTagTable</span>
</h2>
-<p>GtkSourceTagTable — </p>
+<p>GtkSourceTagTable</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -57,7 +57,7 @@ void <a href="GtkSourceTagTable.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2566183"></a><h2>Object Hierarchy</h2>
+<a name="id2550731"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -66,7 +66,7 @@ void <a href="GtkSourceTagTable.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2566214"></a><h2>Signals</h2>
+<a name="id2550761"></a><h2>Signals</h2>
<pre class="synopsis">
"<a href="GtkSourceTagTable.html#GtkSourceTagTable-changed">changed</a>" void user_function (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *sourcetagtable,
@@ -74,26 +74,26 @@ void <a href="GtkSourceTagTable.h
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2566256"></a><h2>Description</h2>
+<a name="id2550804"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2566272"></a><h2>Details</h2>
+<a name="id2550820"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2566283"></a><h3>
+<a name="id2550830"></a><h3>
<a name="GtkSourceTagTable-struct"></a>GtkSourceTagTable</h3>
-<a class="indexterm" name="id2578282"></a><pre class="programlisting">typedef struct _GtkSourceTagTable GtkSourceTagTable;</pre>
+<a class="indexterm" name="id2553008"></a><pre class="programlisting">typedef struct _GtkSourceTagTable GtkSourceTagTable;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2578298"></a><h3>
+<a name="id2553024"></a><h3>
<a name="gtk-source-tag-table-new"></a>gtk_source_tag_table_new ()</h3>
-<a class="indexterm" name="id2578309"></a><pre class="programlisting"><a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a>* gtk_source_tag_table_new (void);</pre>
+<a class="indexterm" name="id2553036"></a><pre class="programlisting"><a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a>* gtk_source_tag_table_new (void);</pre>
<p>
Creates a new <a href="GtkSourceTagTable.html" title="GtkSourceTagTable"><span class="type">GtkSourceTagTable</span></a>. The table contains no tags by
default.</p>
@@ -111,9 +111,9 @@ default.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2578363"></a><h3>
+<a name="id2553089"></a><h3>
<a name="gtk-source-tag-table-add-tags"></a>gtk_source_tag_table_add_tags ()</h3>
-<a class="indexterm" name="id2578374"></a><pre class="programlisting">void gtk_source_tag_table_add_tags (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table,
+<a class="indexterm" name="id2553100"></a><pre class="programlisting">void gtk_source_tag_table_add_tags (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table,
const GSList *tags);</pre>
<p>
Adds a list of tag to the table. The added tags are assigned the highest priority
@@ -143,9 +143,9 @@ then it is not added to the table.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2527288"></a><h3>
+<a name="id2603571"></a><h3>
<a name="gtk-source-tag-table-remove-source-tags"></a>gtk_source_tag_table_remove_source_tags ()</h3>
-<a class="indexterm" name="id2527301"></a><pre class="programlisting">void gtk_source_tag_table_remove_source_tags
+<a class="indexterm" name="id2603584"></a><pre class="programlisting">void gtk_source_tag_table_remove_source_tags
(<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *table);</pre>
<p>
Removes all the source tags from the table. This will remove the table's
@@ -165,11 +165,11 @@ up destroyed if you don't have a referen
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2527364"></a><h2>Signal Details</h2>
+<a name="id2603646"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2527375"></a><h3>
+<a name="id2603657"></a><h3>
<a name="GtkSourceTagTable-changed"></a>The "changed" signal</h3>
-<a class="indexterm" name="id2527382"></a><pre class="programlisting">void user_function (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *sourcetagtable,
+<a class="indexterm" name="id2603665"></a><pre class="programlisting">void user_function (<a href="GtkSourceTagTable.html" title="GtkSourceTagTable">GtkSourceTagTable</a> *sourcetagtable,
gpointer user_data) : Run last</pre>
<p>
diff -pruN 1.8.2-1/docs/reference/html/gtksourceview-GtkSourceMarker.html 1.8.3-0ubuntu1/docs/reference/html/gtksourceview-GtkSourceMarker.html
--- 1.8.2-1/docs/reference/html/gtksourceview-GtkSourceMarker.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/gtksourceview-GtkSourceMarker.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceMarker</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="gtksourceview-Searching-in-a-GtkSourceBuffer.html" title="Searching in a GtkSourceBuffer">
@@ -21,18 +21,18 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceView.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2559450" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2566100" class="shortcut">Top</a>
 | 
- <a href="#id2544574" class="shortcut">Description</a></nobr></td></tr>
+ <a href="#id2578864" class="shortcut">Description</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="gtksourceview-GtkSourceMarker"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2559450"></a><span class="refentrytitle">GtkSourceMarker</span>
+<a name="id2566100"></a><span class="refentrytitle">GtkSourceMarker</span>
</h2>
-<p>GtkSourceMarker — </p>
+<p>GtkSourceMarker</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -59,17 +59,17 @@ const gchar* <a href="gtksourceview-GtkS
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2544574"></a><h2>Description</h2>
+<a name="id2578864"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2544590"></a><h2>Details</h2>
+<a name="id2578879"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2544600"></a><h3>
+<a name="id2578890"></a><h3>
<a name="GtkSourceMarker"></a>GtkSourceMarker</h3>
-<a class="indexterm" name="id2533144"></a><pre class="programlisting">typedef GtkTextMark GtkSourceMarker;
+<a class="indexterm" name="id2558513"></a><pre class="programlisting">typedef GtkTextMark GtkSourceMarker;
</pre>
<p>
@@ -77,9 +77,9 @@ const gchar* <a href="gtksourceview-GtkS
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2533160"></a><h3>
+<a name="id2558528"></a><h3>
<a name="gtk-source-marker-set-marker-type"></a>gtk_source_marker_set_marker_type ()</h3>
-<a class="indexterm" name="id2533172"></a><pre class="programlisting">void gtk_source_marker_set_marker_type
+<a class="indexterm" name="id2558540"></a><pre class="programlisting">void gtk_source_marker_set_marker_type
(<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker,
const gchar *type);</pre>
<p>
@@ -105,9 +105,9 @@ const gchar* <a href="gtksourceview-GtkS
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2533239"></a><h3>
+<a name="id2558607"></a><h3>
<a name="gtk-source-marker-get-marker-type"></a>gtk_source_marker_get_marker_type ()</h3>
-<a class="indexterm" name="id2533253"></a><pre class="programlisting">gchar* gtk_source_marker_get_marker_type
+<a class="indexterm" name="id2558619"></a><pre class="programlisting">gchar* gtk_source_marker_get_marker_type
(<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the marker type of this <em class="parameter"><code>marker</code></em>.</p>
@@ -132,9 +132,9 @@ Gets the marker type of this <em class="
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2532305"></a><h3>
+<a name="id2554470"></a><h3>
<a name="gtk-source-marker-get-line"></a>gtk_source_marker_get_line ()</h3>
-<a class="indexterm" name="id2532317"></a><pre class="programlisting">gint gtk_source_marker_get_line (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2554482"></a><pre class="programlisting">gint gtk_source_marker_get_line (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the line number of this <em class="parameter"><code>marker</code></em>.</p>
<p>
@@ -158,9 +158,9 @@ Gets the line number of this <em class="
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2532390"></a><h3>
+<a name="id2554555"></a><h3>
<a name="gtk-source-marker-get-name"></a>gtk_source_marker_get_name ()</h3>
-<a class="indexterm" name="id2532402"></a><pre class="programlisting">const gchar* gtk_source_marker_get_name (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2554567"></a><pre class="programlisting">const gchar* gtk_source_marker_get_name (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the name of this <em class="parameter"><code>marker</code></em>.</p>
<p>
@@ -184,9 +184,9 @@ Gets the name of this <em class="paramet
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2532476"></a><h3>
+<a name="id2554642"></a><h3>
<a name="gtk-source-marker-get-buffer"></a>gtk_source_marker_get_buffer ()</h3>
-<a class="indexterm" name="id2532490"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_marker_get_buffer
+<a class="indexterm" name="id2554655"></a><pre class="programlisting"><a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a>* gtk_source_marker_get_buffer
(<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the buffer associated with this <em class="parameter"><code>marker</code></em>.</p>
@@ -211,9 +211,9 @@ Gets the buffer associated with this <em
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2476089"></a><h3>
+<a name="id2555993"></a><h3>
<a name="gtk-source-marker-next"></a>gtk_source_marker_next ()</h3>
-<a class="indexterm" name="id2476100"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_next (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2556004"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_next (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the next marker after <em class="parameter"><code>marker</code></em>.</p>
<p>
@@ -237,9 +237,9 @@ Gets the next marker after <em class="pa
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2476182"></a><h3>
+<a name="id2556086"></a><h3>
<a name="gtk-source-marker-prev"></a>gtk_source_marker_prev ()</h3>
-<a class="indexterm" name="id2476193"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_prev (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
+<a class="indexterm" name="id2556097"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a>* gtk_source_marker_prev (<a href="gtksourceview-GtkSourceMarker.html#GtkSourceMarker">GtkSourceMarker</a> *marker);</pre>
<p>
Gets the previous marker before <em class="parameter"><code>marker</code></em>.</p>
<p>
diff -pruN 1.8.2-1/docs/reference/html/gtksourceview-GtkSourceTagStyle.html 1.8.3-0ubuntu1/docs/reference/html/gtksourceview-GtkSourceTagStyle.html
--- 1.8.2-1/docs/reference/html/gtksourceview-GtkSourceTagStyle.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/gtksourceview-GtkSourceTagStyle.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceTagStyle</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceTagTable.html" title="GtkSourceTagTable">
@@ -21,18 +21,18 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourcePrintJob.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2552154" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2562653" class="shortcut">Top</a>
 | 
- <a href="#id2555149" class="shortcut">Description</a></nobr></td></tr>
+ <a href="#id2605034" class="shortcut">Description</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="gtksourceview-GtkSourceTagStyle"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2552154"></a><span class="refentrytitle">GtkSourceTagStyle</span>
+<a name="id2562653"></a><span class="refentrytitle">GtkSourceTagStyle</span>
</h2>
-<p>GtkSourceTagStyle — </p>
+<p>GtkSourceTagStyle</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -54,17 +54,17 @@ void <a href="gtksourceview-GtkSo
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2555149"></a><h2>Description</h2>
+<a name="id2605034"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2555164"></a><h2>Details</h2>
+<a name="id2605050"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2555175"></a><h3>
+<a name="id2605060"></a><h3>
<a name="GtkSourceTagStyle"></a>GtkSourceTagStyle</h3>
-<a class="indexterm" name="id2555188"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2605073"></a><pre class="programlisting">typedef struct {
/* readonly */
gboolean is_default;
@@ -88,9 +88,9 @@ void <a href="gtksourceview-GtkSo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2555208"></a><h3>
+<a name="id2605093"></a><h3>
<a name="GtkSourceTagStyleMask"></a>enum GtkSourceTagStyleMask</h3>
-<a class="indexterm" name="id2555219"></a><pre class="programlisting">typedef enum {
+<a class="indexterm" name="id2599693"></a><pre class="programlisting">typedef enum {
GTK_SOURCE_TAG_STYLE_USE_BACKGROUND = 1 << 0, /*< nick=use_background >*/
GTK_SOURCE_TAG_STYLE_USE_FOREGROUND = 1 << 1 /*< nick=use_foreground >*/
} GtkSourceTagStyleMask;
@@ -101,9 +101,9 @@ void <a href="gtksourceview-GtkSo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2555237"></a><h3>
+<a name="id2599711"></a><h3>
<a name="GTK-TYPE-SOURCE-TAG-STYLE:CAPS"></a>GTK_TYPE_SOURCE_TAG_STYLE</h3>
-<a class="indexterm" name="id2555249"></a><pre class="programlisting">#define GTK_TYPE_SOURCE_TAG_STYLE (gtk_source_tag_style_get_type ())
+<a class="indexterm" name="id2599722"></a><pre class="programlisting">#define GTK_TYPE_SOURCE_TAG_STYLE (gtk_source_tag_style_get_type ())
</pre>
<p>
@@ -111,9 +111,9 @@ void <a href="gtksourceview-GtkSo
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2542698"></a><h3>
+<a name="id2599739"></a><h3>
<a name="gtk-source-tag-style-get-type"></a>gtk_source_tag_style_get_type ()</h3>
-<a class="indexterm" name="id2542709"></a><pre class="programlisting">GType gtk_source_tag_style_get_type (void);</pre>
+<a class="indexterm" name="id2599750"></a><pre class="programlisting">GType gtk_source_tag_style_get_type (void);</pre>
<p>
Retrieves the GType object which is associated with the
<a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle"><span class="type">GtkSourceTagStyle</span></a> class.</p>
@@ -131,9 +131,9 @@ Retrieves the GType object which is asso
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2542764"></a><h3>
+<a name="id2599805"></a><h3>
<a name="gtk-source-tag-style-new"></a>gtk_source_tag_style_new ()</h3>
-<a class="indexterm" name="id2542776"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_new (void);</pre>
+<a class="indexterm" name="id2599816"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_new (void);</pre>
<p>
Creates a new tag style object.</p>
<p>
@@ -150,9 +150,9 @@ Creates a new tag style object.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2542822"></a><h3>
+<a name="id2599975"></a><h3>
<a name="gtk-source-tag-style-copy"></a>gtk_source_tag_style_copy ()</h3>
-<a class="indexterm" name="id2542833"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_copy
+<a class="indexterm" name="id2599987"></a><pre class="programlisting"><a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a>* gtk_source_tag_style_copy
(const <a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
Makes a copy of the given <em class="parameter"><code>style</code></em>.</p>
@@ -177,9 +177,9 @@ Makes a copy of the given <em class="par
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2579371"></a><h3>
+<a name="id2600068"></a><h3>
<a name="gtk-source-tag-style-free"></a>gtk_source_tag_style_free ()</h3>
-<a class="indexterm" name="id2579382"></a><pre class="programlisting">void gtk_source_tag_style_free (<a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
+<a class="indexterm" name="id2600080"></a><pre class="programlisting">void gtk_source_tag_style_free (<a href="gtksourceview-GtkSourceTagStyle.html#GtkSourceTagStyle">GtkSourceTagStyle</a> *style);</pre>
<p>
Frees the resources allocated by the given <em class="parameter"><code>style</code></em>.</p>
<p>
diff -pruN 1.8.2-1/docs/reference/html/GtkSourceView.html 1.8.3-0ubuntu1/docs/reference/html/GtkSourceView.html
--- 1.8.2-1/docs/reference/html/GtkSourceView.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/GtkSourceView.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceView</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="gtksourceview-GtkSourceMarker.html" title="GtkSourceMarker">
@@ -21,28 +21,28 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceLanguage.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2561071" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2585861" class="shortcut">Top</a>
 | 
- <a href="#id2574885" class="shortcut">Description</a>
+ <a href="#id2600264" class="shortcut">Description</a>
 | 
- <a href="#id2522709" class="shortcut">Object Hierarchy</a>
+ <a href="#id2559028" class="shortcut">Object Hierarchy</a>
 | 
- <a href="#id2522191" class="shortcut">Implemented Interfaces</a>
+ <a href="#id2593761" class="shortcut">Implemented Interfaces</a>
 | 
- <a href="#id2522212" class="shortcut">Properties</a>
+ <a href="#id2593783" class="shortcut">Properties</a>
 | 
- <a href="#id2522357" class="shortcut">Style Properties</a>
+ <a href="#id2593928" class="shortcut">Style Properties</a>
 | 
- <a href="#id2522437" class="shortcut">Signals</a></nobr></td></tr>
+ <a href="#id2594008" class="shortcut">Signals</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="GtkSourceView"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2561071"></a><span class="refentrytitle">GtkSourceView</span>
+<a name="id2585861"></a><span class="refentrytitle">GtkSourceView</span>
</h2>
-<p>GtkSourceView — </p>
+<p>GtkSourceView</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -109,7 +109,7 @@ gboolean <a href="GtkSourceView.html#
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2522709"></a><h2>Object Hierarchy</h2>
+<a name="id2559028"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
GObject
@@ -122,13 +122,13 @@ gboolean <a href="GtkSourceView.html#
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2522191"></a><h2>Implemented Interfaces</h2>
+<a name="id2593761"></a><h2>Implemented Interfaces</h2>
<p>
GtkSourceView implements
AtkImplementorIface.</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2522212"></a><h2>Properties</h2>
+<a name="id2593783"></a><h2>Properties</h2>
<pre class="synopsis">
"<a href="GtkSourceView.html#GtkSourceView--auto-indent">auto-indent</a>" gboolean : Read / Write
@@ -144,7 +144,7 @@ GtkSourceView implements
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2522357"></a><h2>Style Properties</h2>
+<a name="id2593928"></a><h2>Style Properties</h2>
<pre class="synopsis">
"<a href="GtkSourceView.html#GtkSourceView--right-margin-line-alpha">right-margin-line-alpha</a>" gint : Read
@@ -155,7 +155,7 @@ GtkSourceView implements
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2522437"></a><h2>Signals</h2>
+<a name="id2594008"></a><h2>Signals</h2>
<pre class="synopsis">
"<a href="GtkSourceView.html#GtkSourceView-redo">redo</a>" void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
@@ -165,26 +165,26 @@ GtkSourceView implements
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2574885"></a><h2>Description</h2>
+<a name="id2600264"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2574898"></a><h2>Details</h2>
+<a name="id2600277"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2574908"></a><h3>
+<a name="id2600287"></a><h3>
<a name="GtkSourceView-struct"></a>GtkSourceView</h3>
-<a class="indexterm" name="id2574918"></a><pre class="programlisting">typedef struct _GtkSourceView GtkSourceView;</pre>
+<a class="indexterm" name="id2600297"></a><pre class="programlisting">typedef struct _GtkSourceView GtkSourceView;</pre>
<p>
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2574933"></a><h3>
+<a name="id2600312"></a><h3>
<a name="gtk-source-view-new"></a>gtk_source_view_new ()</h3>
-<a class="indexterm" name="id2574945"></a><pre class="programlisting">GtkWidget* gtk_source_view_new (void);</pre>
+<a class="indexterm" name="id2600323"></a><pre class="programlisting">GtkWidget* gtk_source_view_new (void);</pre>
<p>
Creates a new <a href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a>. An empty default buffer will be
created for you. If you want to specify your own buffer, consider
@@ -203,9 +203,9 @@ created for you. If you want to specify
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575012"></a><h3>
+<a name="id2600389"></a><h3>
<a name="gtk-source-view-new-with-buffer"></a>gtk_source_view_new_with_buffer ()</h3>
-<a class="indexterm" name="id2575025"></a><pre class="programlisting">GtkWidget* gtk_source_view_new_with_buffer (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
+<a class="indexterm" name="id2600402"></a><pre class="programlisting">GtkWidget* gtk_source_view_new_with_buffer (<a href="GtkSourceBuffer.html" title="GtkSourceBuffer">GtkSourceBuffer</a> *buffer);</pre>
<p>
Creates a new <a href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a> widget displaying the buffer
<em class="parameter"><code>buffer</code></em>. One buffer can be shared among many widgets.</p>
@@ -230,9 +230,9 @@ Creates a new <a href="GtkSourceView.htm
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575114"></a><h3>
+<a name="id2600492"></a><h3>
<a name="gtk-source-view-set-show-line-numbers"></a>gtk_source_view_set_show_line_numbers ()</h3>
-<a class="indexterm" name="id2575128"></a><pre class="programlisting">void gtk_source_view_set_show_line_numbers
+<a class="indexterm" name="id2600506"></a><pre class="programlisting">void gtk_source_view_set_show_line_numbers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
@@ -258,9 +258,9 @@ If <code class="literal">TRUE</code> lin
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575218"></a><h3>
+<a name="id2600596"></a><h3>
<a name="gtk-source-view-get-show-line-numbers"></a>gtk_source_view_get_show_line_numbers ()</h3>
-<a class="indexterm" name="id2575232"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_numbers
+<a class="indexterm" name="id2600609"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_numbers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether line numbers are displayed beside the text.</p>
@@ -285,9 +285,9 @@ Returns whether line numbers are display
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575312"></a><h3>
+<a name="id2600689"></a><h3>
<a name="gtk-source-view-set-show-line-markers"></a>gtk_source_view_set_show_line_markers ()</h3>
-<a class="indexterm" name="id2575325"></a><pre class="programlisting">void gtk_source_view_set_show_line_markers
+<a class="indexterm" name="id2600703"></a><pre class="programlisting">void gtk_source_view_set_show_line_markers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
@@ -313,9 +313,9 @@ If <code class="literal">TRUE</code> lin
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575390"></a><h3>
+<a name="id2600793"></a><h3>
<a name="gtk-source-view-get-show-line-markers"></a>gtk_source_view_get_show_line_markers ()</h3>
-<a class="indexterm" name="id2575403"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_markers
+<a class="indexterm" name="id2600806"></a><pre class="programlisting">gboolean gtk_source_view_get_show_line_markers
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether line markers are displayed beside the text.</p>
@@ -340,9 +340,9 @@ Returns whether line markers are display
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575475"></a><h3>
+<a name="id2600886"></a><h3>
<a name="gtk-source-view-set-tabs-width"></a>gtk_source_view_set_tabs_width ()</h3>
-<a class="indexterm" name="id2575487"></a><pre class="programlisting">void gtk_source_view_set_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2600899"></a><pre class="programlisting">void gtk_source_view_set_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
guint width);</pre>
<p>
Sets the width of tabulation in characters.</p>
@@ -367,9 +367,9 @@ Sets the width of tabulation in characte
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575558"></a><h3>
+<a name="id2600979"></a><h3>
<a name="gtk-source-view-get-tabs-width"></a>gtk_source_view_get_tabs_width ()</h3>
-<a class="indexterm" name="id2575571"></a><pre class="programlisting">guint gtk_source_view_get_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2600992"></a><pre class="programlisting">guint gtk_source_view_get_tabs_width (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns the width of tabulation in characters.</p>
<p>
@@ -393,9 +393,9 @@ Returns the width of tabulation in chara
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575632"></a><h3>
+<a name="id2601061"></a><h3>
<a name="gtk-source-view-set-auto-indent"></a>gtk_source_view_set_auto_indent ()</h3>
-<a class="indexterm" name="id2575644"></a><pre class="programlisting">void gtk_source_view_set_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2601074"></a><pre class="programlisting">void gtk_source_view_set_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
If <code class="literal">TRUE</code> auto indentation of text is enabled.</p>
@@ -420,9 +420,9 @@ If <code class="literal">TRUE</code> aut
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575724"></a><h3>
+<a name="id2601163"></a><h3>
<a name="gtk-source-view-get-auto-indent"></a>gtk_source_view_get_auto_indent ()</h3>
-<a class="indexterm" name="id2575736"></a><pre class="programlisting">gboolean gtk_source_view_get_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2601176"></a><pre class="programlisting">gboolean gtk_source_view_get_auto_indent (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether auto indentation of text is enabled.</p>
<p>
@@ -446,9 +446,9 @@ Returns whether auto indentation of text
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575806"></a><h3>
+<a name="id2601255"></a><h3>
<a name="gtk-source-view-set-insert-spaces-instead-of-tabs"></a>gtk_source_view_set_insert_spaces_instead_of_tabs ()</h3>
-<a class="indexterm" name="id2575820"></a><pre class="programlisting">void gtk_source_view_set_insert_spaces_instead_of_tabs
+<a class="indexterm" name="id2601269"></a><pre class="programlisting">void gtk_source_view_set_insert_spaces_instead_of_tabs
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
@@ -475,9 +475,9 @@ of space characters.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575901"></a><h3>
+<a name="id2601360"></a><h3>
<a name="gtk-source-view-get-insert-spaces-instead-of-tabs"></a>gtk_source_view_get_insert_spaces_instead_of_tabs ()</h3>
-<a class="indexterm" name="id2575914"></a><pre class="programlisting">gboolean gtk_source_view_get_insert_spaces_instead_of_tabs
+<a class="indexterm" name="id2601374"></a><pre class="programlisting">gboolean gtk_source_view_get_insert_spaces_instead_of_tabs
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether when inserting a tabulator character it should
@@ -503,9 +503,9 @@ be replaced by a group of space characte
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2575987"></a><h3>
+<a name="id2601455"></a><h3>
<a name="gtk-source-view-set-indent-on-tab"></a>gtk_source_view_set_indent_on_tab ()</h3>
-<a class="indexterm" name="id2576002"></a><pre class="programlisting">void gtk_source_view_set_indent_on_tab
+<a class="indexterm" name="id2601471"></a><pre class="programlisting">void gtk_source_view_set_indent_on_tab
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
@@ -535,9 +535,9 @@ the \t characters. Shift+Tab unindents t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576090"></a><h3>
+<a name="id2601570"></a><h3>
<a name="gtk-source-view-get-indent-on-tab"></a>gtk_source_view_get_indent_on_tab ()</h3>
-<a class="indexterm" name="id2576106"></a><pre class="programlisting">gboolean gtk_source_view_get_indent_on_tab
+<a class="indexterm" name="id2601586"></a><pre class="programlisting">gboolean gtk_source_view_get_indent_on_tab
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether when the tab key is pressed the current selection
@@ -566,9 +566,9 @@ should get indented instead of replaced
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576184"></a><h3>
+<a name="id2601673"></a><h3>
<a name="gtk-source-view-set-show-margin"></a>gtk_source_view_set_show_margin ()</h3>
-<a class="indexterm" name="id2576196"></a><pre class="programlisting">void gtk_source_view_set_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2601687"></a><pre class="programlisting">void gtk_source_view_set_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
If <code class="literal">TRUE</code> a margin is displayed</p>
@@ -593,9 +593,9 @@ If <code class="literal">TRUE</code> a m
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576274"></a><h3>
+<a name="id2601774"></a><h3>
<a name="gtk-source-view-get-show-margin"></a>gtk_source_view_get_show_margin ()</h3>
-<a class="indexterm" name="id2576286"></a><pre class="programlisting">gboolean gtk_source_view_get_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2601787"></a><pre class="programlisting">gboolean gtk_source_view_get_show_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether a margin is displayed.</p>
<p>
@@ -619,9 +619,9 @@ Returns whether a margin is displayed.</
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576356"></a><h3>
+<a name="id2601865"></a><h3>
<a name="gtk-source-view-set-margin"></a>gtk_source_view_set_margin ()</h3>
-<a class="indexterm" name="id2576367"></a><pre class="programlisting">void gtk_source_view_set_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
+<a class="indexterm" name="id2601877"></a><pre class="programlisting">void gtk_source_view_set_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
guint margin);</pre>
<p>
Sets the position of the right margin in the given <em class="parameter"><code>view</code></em>.</p>
@@ -646,9 +646,9 @@ Sets the position of the right margin in
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576443"></a><h3>
+<a name="id2601962"></a><h3>
<a name="gtk-source-view-get-margin"></a>gtk_source_view_get_margin ()</h3>
-<a class="indexterm" name="id2576454"></a><pre class="programlisting">guint gtk_source_view_get_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
+<a class="indexterm" name="id2601974"></a><pre class="programlisting">guint gtk_source_view_get_margin (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Gets the position of the right margin in the given <em class="parameter"><code>view</code></em>.</p>
<p>
@@ -672,9 +672,9 @@ Gets the position of the right margin in
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576520"></a><h3>
+<a name="id2602048"></a><h3>
<a name="gtk-source-view-set-highlight-current-line"></a>gtk_source_view_set_highlight_current_line ()</h3>
-<a class="indexterm" name="id2576534"></a><pre class="programlisting">void gtk_source_view_set_highlight_current_line
+<a class="indexterm" name="id2602063"></a><pre class="programlisting">void gtk_source_view_set_highlight_current_line
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean show);</pre>
<p>
@@ -700,9 +700,9 @@ If TRUE the current line is highlighted<
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576605"></a><h3>
+<a name="id2602143"></a><h3>
<a name="gtk-source-view-get-highlight-current-line"></a>gtk_source_view_get_highlight_current_line ()</h3>
-<a class="indexterm" name="id2576619"></a><pre class="programlisting">gboolean gtk_source_view_get_highlight_current_line
+<a class="indexterm" name="id2602157"></a><pre class="programlisting">gboolean gtk_source_view_get_highlight_current_line
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether the current line is highlighted</p>
@@ -727,9 +727,9 @@ Returns whether the current line is high
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576681"></a><h3>
+<a name="id2602227"></a><h3>
<a name="gtk-source-view-set-marker-pixbuf"></a>gtk_source_view_set_marker_pixbuf ()</h3>
-<a class="indexterm" name="id2576695"></a><pre class="programlisting">void gtk_source_view_set_marker_pixbuf
+<a class="indexterm" name="id2602241"></a><pre class="programlisting">void gtk_source_view_set_marker_pixbuf
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
const gchar *marker_type,
GdkPixbuf *pixbuf);</pre>
@@ -761,9 +761,9 @@ Associates a given <em class="parameter"
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576800"></a><h3>
+<a name="id2602332"></a><h3>
<a name="gtk-source-view-get-marker-pixbuf"></a>gtk_source_view_get_marker_pixbuf ()</h3>
-<a class="indexterm" name="id2576813"></a><pre class="programlisting">GdkPixbuf* gtk_source_view_get_marker_pixbuf
+<a class="indexterm" name="id2602345"></a><pre class="programlisting">GdkPixbuf* gtk_source_view_get_marker_pixbuf
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
const gchar *marker_type);</pre>
<p>
@@ -786,7 +786,9 @@ Gets the pixbuf which is associated with
</tr>
<tr>
<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a <span class="type">GdkPixbuf</span> if found, or <code class="literal">NULL</code> if not found.
+<td> a <span class="type">GdkPixbuf</span> if found, or <a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> if not found.
</td>
</tr>
</tbody>
@@ -794,9 +796,9 @@ Gets the pixbuf which is associated with
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2576913"></a><h3>
+<a name="id2602445"></a><h3>
<a name="gtk-source-view-set-smart-home-end"></a>gtk_source_view_set_smart_home_end ()</h3>
-<a class="indexterm" name="id2576926"></a><pre class="programlisting">void gtk_source_view_set_smart_home_end
+<a class="indexterm" name="id2602458"></a><pre class="programlisting">void gtk_source_view_set_smart_home_end
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view,
gboolean enable);</pre>
<p>
@@ -823,9 +825,9 @@ character of the line before moving to t
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577008"></a><h3>
+<a name="id2602540"></a><h3>
<a name="gtk-source-view-get-smart-home-end"></a>gtk_source_view_get_smart_home_end ()</h3>
-<a class="indexterm" name="id2577021"></a><pre class="programlisting">gboolean gtk_source_view_get_smart_home_end
+<a class="indexterm" name="id2602553"></a><pre class="programlisting">gboolean gtk_source_view_get_smart_home_end
(<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *view);</pre>
<p>
Returns whether HOME and END keys will move to the first/last non-space
@@ -851,95 +853,95 @@ character of the line before moving to t
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2577094"></a><h2>Property Details</h2>
+<a name="id2602626"></a><h2>Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2577103"></a><h3>
+<a name="id2602635"></a><h3>
<a name="GtkSourceView--auto-indent"></a>The "<code class="literal">auto-indent</code>" property</h3>
-<a class="indexterm" name="id2577116"></a><pre class="programlisting"> "auto-indent" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602648"></a><pre class="programlisting"> "auto-indent" gboolean : Read / Write</pre>
<p>Whether to enable auto indentation.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577139"></a><h3>
+<a name="id2602671"></a><h3>
<a name="GtkSourceView--highlight-current-line"></a>The "<code class="literal">highlight-current-line</code>" property</h3>
-<a class="indexterm" name="id2577154"></a><pre class="programlisting"> "highlight-current-line" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602686"></a><pre class="programlisting"> "highlight-current-line" gboolean : Read / Write</pre>
<p>Whether to highlight the current line.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577177"></a><h3>
+<a name="id2602709"></a><h3>
<a name="GtkSourceView--indent-on-tab"></a>The "<code class="literal">indent-on-tab</code>" property</h3>
-<a class="indexterm" name="id2577192"></a><pre class="programlisting"> "indent-on-tab" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602724"></a><pre class="programlisting"> "indent-on-tab" gboolean : Read / Write</pre>
<p>Whether to indent the selected text when the tab key is pressed.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577215"></a><h3>
+<a name="id2602747"></a><h3>
<a name="GtkSourceView--insert-spaces-instead-of-tabs"></a>The "<code class="literal">insert-spaces-instead-of-tabs</code>" property</h3>
-<a class="indexterm" name="id2577230"></a><pre class="programlisting"> "insert-spaces-instead-of-tabs" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602762"></a><pre class="programlisting"> "insert-spaces-instead-of-tabs" gboolean : Read / Write</pre>
<p>Whether to insert spaces instead of tabs.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577255"></a><h3>
+<a name="id2602787"></a><h3>
<a name="GtkSourceView--margin"></a>The "<code class="literal">margin</code>" property</h3>
-<a class="indexterm" name="id2577268"></a><pre class="programlisting"> "margin" guint : Read / Write</pre>
+<a class="indexterm" name="id2602800"></a><pre class="programlisting"> "margin" guint : Read / Write</pre>
<p>Position of the right margin.</p>
<p>Allowed values: [1,200]</p>
<p>Default value: 80</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577294"></a><h3>
+<a name="id2602826"></a><h3>
<a name="GtkSourceView--show-line-markers"></a>The "<code class="literal">show-line-markers</code>" property</h3>
-<a class="indexterm" name="id2577309"></a><pre class="programlisting"> "show-line-markers" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602841"></a><pre class="programlisting"> "show-line-markers" gboolean : Read / Write</pre>
<p>Whether to display line marker pixbufs.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577332"></a><h3>
+<a name="id2602864"></a><h3>
<a name="GtkSourceView--show-line-numbers"></a>The "<code class="literal">show-line-numbers</code>" property</h3>
-<a class="indexterm" name="id2577347"></a><pre class="programlisting"> "show-line-numbers" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602879"></a><pre class="programlisting"> "show-line-numbers" gboolean : Read / Write</pre>
<p>Whether to display line numbers.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577370"></a><h3>
+<a name="id2602902"></a><h3>
<a name="GtkSourceView--show-margin"></a>The "<code class="literal">show-margin</code>" property</h3>
-<a class="indexterm" name="id2577383"></a><pre class="programlisting"> "show-margin" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602915"></a><pre class="programlisting"> "show-margin" gboolean : Read / Write</pre>
<p>Whether to display the right margin.</p>
<p>Default value: FALSE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577406"></a><h3>
+<a name="id2602938"></a><h3>
<a name="GtkSourceView--smart-home-end"></a>The "<code class="literal">smart-home-end</code>" property</h3>
-<a class="indexterm" name="id2577421"></a><pre class="programlisting"> "smart-home-end" gboolean : Read / Write</pre>
+<a class="indexterm" name="id2602953"></a><pre class="programlisting"> "smart-home-end" gboolean : Read / Write</pre>
<p>HOME and END keys move to first/last non whitespace characters on line before going to the start/end of the line.</p>
<p>Default value: TRUE</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577445"></a><h3>
+<a name="id2602977"></a><h3>
<a name="GtkSourceView--tabs-width"></a>The "<code class="literal">tabs-width</code>" property</h3>
-<a class="indexterm" name="id2577458"></a><pre class="programlisting"> "tabs-width" guint : Read / Write</pre>
+<a class="indexterm" name="id2602990"></a><pre class="programlisting"> "tabs-width" guint : Read / Write</pre>
<p>Tabs Width.</p>
<p>Allowed values: [1,32]</p>
<p>Default value: 8</p>
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2577485"></a><h2>Style Property Details</h2>
+<a name="id2603017"></a><h2>Style Property Details</h2>
<div class="refsect2" lang="en">
-<a name="id2577495"></a><h3>
+<a name="id2603027"></a><h3>
<a name="GtkSourceView--right-margin-line-alpha"></a>The "<code class="literal">right-margin-line-alpha</code>" style property</h3>
-<a class="indexterm" name="id2577510"></a><pre class="programlisting"> "right-margin-line-alpha" gint : Read</pre>
+<a class="indexterm" name="id2603042"></a><pre class="programlisting"> "right-margin-line-alpha" gint : Read</pre>
<p>
The ::right-margin-line-alpha determines the alpha component with
which the vertical line will be drawn. 0 means it is fully transparent
@@ -955,9 +957,9 @@ be visible).</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577548"></a><h3>
+<a name="id2603080"></a><h3>
<a name="GtkSourceView--right-margin-line-color"></a>The "<code class="literal">right-margin-line-color</code>" style property</h3>
-<a class="indexterm" name="id2577563"></a><pre class="programlisting"> "right-margin-line-color" GdkColor : Read</pre>
+<a class="indexterm" name="id2603095"></a><pre class="programlisting"> "right-margin-line-color" GdkColor : Read</pre>
<p>
The ::right-margin-line-color property contains the color with
which the right margin line (vertical line indicating the right
@@ -970,9 +972,9 @@ margin) will be drawn.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577593"></a><h3>
+<a name="id2603125"></a><h3>
<a name="GtkSourceView--right-margin-overlay-alpha"></a>The "<code class="literal">right-margin-overlay-alpha</code>" style property</h3>
-<a class="indexterm" name="id2577608"></a><pre class="programlisting"> "right-margin-overlay-alpha" gint : Read</pre>
+<a class="indexterm" name="id2603140"></a><pre class="programlisting"> "right-margin-overlay-alpha" gint : Read</pre>
<p>
The ::right-margin-overlay-alpha determines the alpha component with
which the overlay will be drawn. 0 means it is fully transparent
@@ -988,9 +990,9 @@ won't be visible).</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577646"></a><h3>
+<a name="id2603178"></a><h3>
<a name="GtkSourceView--right-margin-overlay-color"></a>The "<code class="literal">right-margin-overlay-color</code>" style property</h3>
-<a class="indexterm" name="id2577661"></a><pre class="programlisting"> "right-margin-overlay-color" GdkColor : Read</pre>
+<a class="indexterm" name="id2603193"></a><pre class="programlisting"> "right-margin-overlay-color" GdkColor : Read</pre>
<p>
The ::right-margin-overlay-color property contains the color with
which the right margin overlay will be drawn. Setting this property
@@ -1003,9 +1005,9 @@ will only have an effect if ::right-marg
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577693"></a><h3>
+<a name="id2603225"></a><h3>
<a name="GtkSourceView--right-margin-overlay-toggle"></a>The "<code class="literal">right-margin-overlay-toggle</code>" style property</h3>
-<a class="indexterm" name="id2577708"></a><pre class="programlisting"> "right-margin-overlay-toggle" gchararray : Read</pre>
+<a class="indexterm" name="id2603240"></a><pre class="programlisting"> "right-margin-overlay-toggle" gchararray : Read</pre>
<p>
The ::right-margin-overlay-toggle property determines whether the
widget will draw a transparent overlay on top of the area on the
@@ -1020,11 +1022,11 @@ noticable performance impact, so this pr
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2577744"></a><h2>Signal Details</h2>
+<a name="id2603276"></a><h2>Signal Details</h2>
<div class="refsect2" lang="en">
-<a name="id2577754"></a><h3>
+<a name="id2603286"></a><h3>
<a name="GtkSourceView-redo"></a>The "redo" signal</h3>
-<a class="indexterm" name="id2577761"></a><pre class="programlisting">void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
+<a class="indexterm" name="id2603293"></a><pre class="programlisting">void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
gpointer user_data) : Run last / Action</pre>
<p>
@@ -1047,9 +1049,9 @@ noticable performance impact, so this pr
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577822"></a><h3>
+<a name="id2603354"></a><h3>
<a name="GtkSourceView-undo"></a>The "undo" signal</h3>
-<a class="indexterm" name="id2577829"></a><pre class="programlisting">void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
+<a class="indexterm" name="id2603361"></a><pre class="programlisting">void user_function (<a href="GtkSourceView.html" title="GtkSourceView">GtkSourceView</a> *sourceview,
gpointer user_data) : Run last / Action</pre>
<p>
diff -pruN 1.8.2-1/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html 1.8.3-0ubuntu1/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html
--- 1.8.2-1/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/gtksourceview-Searching-in-a-GtkSourceBuffer.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Searching in a GtkSourceBuffer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="rn01.html" title="API reference">
<link rel="prev" href="GtkSourceBuffer.html" title="GtkSourceBuffer">
@@ -21,18 +21,18 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="gtksourceview-GtkSourceMarker.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2558248" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2582019" class="shortcut">Top</a>
 | 
- <a href="#id2531532" class="shortcut">Description</a></nobr></td></tr>
+ <a href="#id2556895" class="shortcut">Description</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="gtksourceview-Searching-in-a-GtkSourceBuffer"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2558248"></a><span class="refentrytitle">Searching in a GtkSourceBuffer</span>
+<a name="id2582019"></a><span class="refentrytitle">Searching in a GtkSourceBuffer</span>
</h2>
-<p>Searching in a GtkSourceBuffer — </p>
+<p>Searching in a GtkSourceBuffer</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
@@ -61,17 +61,17 @@ gboolean <a href="gtksourceview-Searc
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2531532"></a><h2>Description</h2>
+<a name="id2556895"></a><h2>Description</h2>
<p>
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2531548"></a><h2>Details</h2>
+<a name="id2556911"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2531558"></a><h3>
+<a name="id2556922"></a><h3>
<a name="GtkSourceSearchFlags"></a>enum GtkSourceSearchFlags</h3>
-<a class="indexterm" name="id2531569"></a><pre class="programlisting">typedef enum
+<a class="indexterm" name="id2556933"></a><pre class="programlisting">typedef enum
{
GTK_SOURCE_SEARCH_VISIBLE_ONLY = 1 << 0,
GTK_SOURCE_SEARCH_TEXT_ONLY = 1 << 1,
@@ -85,9 +85,9 @@ gboolean <a href="gtksourceview-Searc
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2537671"></a><h3>
+<a name="id2580311"></a><h3>
<a name="gtk-source-iter-backward-search"></a>gtk_source_iter_backward_search ()</h3>
-<a class="indexterm" name="id2537682"></a><pre class="programlisting">gboolean gtk_source_iter_backward_search (const GtkTextIter *iter,
+<a class="indexterm" name="id2580322"></a><pre class="programlisting">gboolean gtk_source_iter_backward_search (const GtkTextIter *iter,
const gchar *str,
<a href="gtksourceview-Searching-in-a-GtkSourceBuffer.html#GtkSourceSearchFlags">GtkSourceSearchFlags</a> flags,
GtkTextIter *match_start,
@@ -119,17 +119,23 @@ searching.</p>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>match_start</code></em> :</span></td>
-<td> return location for start of match, or %<code class="literal">NULL</code>.
+<td> return location for start of match, or %<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>match_end</code></em> :</span></td>
-<td> return location for end of match, or %<code class="literal">NULL</code>.
+<td> return location for end of match, or %<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>limit</code></em> :</span></td>
-<td> location of last possible <em class="parameter"><code>match_start</code></em>, or %<code class="literal">NULL</code> for start of buffer.
+<td> location of last possible <em class="parameter"><code>match_start</code></em>, or %<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> for start of buffer.
</td>
</tr>
<tr>
@@ -142,9 +148,9 @@ searching.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2523212"></a><h3>
+<a name="id2547896"></a><h3>
<a name="gtk-source-iter-forward-search"></a>gtk_source_iter_forward_search ()</h3>
-<a class="indexterm" name="id2523223"></a><pre class="programlisting">gboolean gtk_source_iter_forward_search (const GtkTextIter *iter,
+<a class="indexterm" name="id2547909"></a><pre class="programlisting">gboolean gtk_source_iter_forward_search (const GtkTextIter *iter,
const gchar *str,
<a href="gtksourceview-Searching-in-a-GtkSourceBuffer.html#GtkSourceSearchFlags">GtkSourceSearchFlags</a> flags,
GtkTextIter *match_start,
@@ -195,17 +201,23 @@ searching.</p>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>match_start</code></em> :</span></td>
-<td> return location for start of match, or %<code class="literal">NULL</code>.
+<td> return location for start of match, or %<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>match_end</code></em> :</span></td>
-<td> return location for end of match, or %<code class="literal">NULL</code>.
+<td> return location for end of match, or %<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a>.
</td>
</tr>
<tr>
<td><span class="term"><em class="parameter"><code>limit</code></em> :</span></td>
-<td> bound for the search, or %<code class="literal">NULL</code> for the end of the buffer.
+<td> bound for the search, or %<a
+href="../liboil/liboil-liboiljunk.html#NULL:CAPS"
+><code class="literal">NULL</code></a> for the end of the buffer.
</td>
</tr>
<tr>
@@ -218,9 +230,9 @@ searching.</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2532794"></a><h3>
+<a name="id2501548"></a><h3>
<a name="gtk-source-iter-find-matching-bracket"></a>gtk_source_iter_find_matching_bracket ()</h3>
-<a class="indexterm" name="id2532808"></a><pre class="programlisting">gboolean gtk_source_iter_find_matching_bracket
+<a class="indexterm" name="id2501561"></a><pre class="programlisting">gboolean gtk_source_iter_find_matching_bracket
(GtkTextIter *iter);</pre>
<p>
Tries to match the bracket character currently at <em class="parameter"><code>iter</code></em> with its
diff -pruN 1.8.2-1/docs/reference/html/index.html 1.8.3-0ubuntu1/docs/reference/html/index.html
--- 1.8.2-1/docs/reference/html/index.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/index.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>GtkSourceView Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="next" href="rn01.html" title="API reference">
<meta name="generator" content="GTK-Doc V1.7 (XML mode)">
@@ -14,51 +14,48 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GtkSourceView Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for GtkSourceView 1.8.2
+<div><p class="releaseinfo">for GtkSourceView 1.8.3
</p></div>
</div>
<hr>
</div>
-<div class="toc">
-<p><b>Table of Contents</b></p>
-<dl>
+<div class="toc"><dl>
<dt><span class="reference"><a href="rn01.html">I. API reference</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="GtkSourceBuffer.html">GtkSourceBuffer</a></span><span class="refpurpose"> - Text buffer object for GtkSourceView</span>
+<span class="refentrytitle"><a href="GtkSourceBuffer.html">GtkSourceBuffer</a></span><span class="refpurpose"> — Text buffer object for <a href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gtksourceview-Searching-in-a-GtkSourceBuffer.html">Searching in a GtkSourceBuffer</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="gtksourceview-Searching-in-a-GtkSourceBuffer.html">Searching in a GtkSourceBuffer</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gtksourceview-GtkSourceMarker.html">GtkSourceMarker</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="gtksourceview-GtkSourceMarker.html">GtkSourceMarker</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourceView.html">GtkSourceView</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="GtkSourceView.html">GtkSourceView</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourceLanguage.html">GtkSourceLanguage</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="GtkSourceLanguage.html">GtkSourceLanguage</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourceLanguagesManager.html">GtkSourceLanguagesManager</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="GtkSourceLanguagesManager.html">GtkSourceLanguagesManager</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourceStyleScheme.html">GtkSourceStyleScheme</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="GtkSourceStyleScheme.html">GtkSourceStyleScheme</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourceTag.html">GtkSourceTag</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="GtkSourceTag.html">GtkSourceTag</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourceTagTable.html">GtkSourceTagTable</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="GtkSourceTagTable.html">GtkSourceTagTable</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gtksourceview-GtkSourceTagStyle.html">GtkSourceTagStyle</a></span><span class="refpurpose"> - </span>
+<span class="refentrytitle"><a href="gtksourceview-GtkSourceTagStyle.html">GtkSourceTagStyle</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="GtkSourcePrintJob.html">GtkSourcePrintJob</a></span><span class="refpurpose"> - Printing a GtkSourceBuffer.</span>
+<span class="refentrytitle"><a href="GtkSourcePrintJob.html">GtkSourcePrintJob</a></span><span class="refpurpose"> — Printing a <a href="GtkSourceBuffer.html" title="GtkSourceBuffer"><span class="type">GtkSourceBuffer</span></a>.</span>
</dt>
</dl></dd>
-</dl>
-</div>
+</dl></div>
</div></body>
</html>
diff -pruN 1.8.2-1/docs/reference/html/rn01.html 1.8.3-0ubuntu1/docs/reference/html/rn01.html
--- 1.8.2-1/docs/reference/html/rn01.html 2006-12-13 12:05:11.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/html/rn01.html 2007-01-08 19:51:37.000000000 +0000
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>API reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.71.0">
<link rel="start" href="index.html" title="GtkSourceView Reference Manual">
<link rel="up" href="index.html" title="GtkSourceView Reference Manual">
<link rel="prev" href="index.html" title="GtkSourceView Reference Manual">
@@ -20,12 +20,10 @@
<th width="100%" align="center">GtkSourceView Reference Manual</th>
<td><a accesskey="n" href="GtkSourceBuffer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
-<div class="reference" lang="en">
-<a name="id2513197"></a><div class="titlepage">
+<div class="reference" lang="en"><div class="titlepage">
<div><div><h1 class="title">
-<a name="id2513197"></a>API reference</h1></div></div>
+<a name="id2538563"></a>API reference</h1></div></div>
<hr>
-</div>
-</div>
+</div></div>
</body>
</html>
diff -pruN 1.8.2-1/docs/reference/Makefile.in 1.8.3-0ubuntu1/docs/reference/Makefile.in
--- 1.8.2-1/docs/reference/Makefile.in 2006-12-13 12:03:10.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/Makefile.in 2007-01-08 19:49:15.000000000 +0000
@@ -106,6 +106,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -180,13 +181,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -203,23 +200,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -pruN 1.8.2-1/docs/reference/version.xml 1.8.3-0ubuntu1/docs/reference/version.xml
--- 1.8.2-1/docs/reference/version.xml 2006-12-13 12:03:23.000000000 +0000
+++ 1.8.3-0ubuntu1/docs/reference/version.xml 2007-01-08 19:49:26.000000000 +0000
@@ -1 +1 @@
-1.8.2
+1.8.3
diff -pruN 1.8.2-1/gtksourceview/gnu-regex/Makefile.in 1.8.3-0ubuntu1/gtksourceview/gnu-regex/Makefile.in
--- 1.8.2-1/gtksourceview/gnu-regex/Makefile.in 2006-12-13 12:03:11.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/gnu-regex/Makefile.in 2007-01-08 19:49:15.000000000 +0000
@@ -119,6 +119,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -193,13 +194,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -216,23 +213,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -pruN 1.8.2-1/gtksourceview/language-specs/ada.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/ada.lang
--- 1.8.2-1/gtksourceview/language-specs/ada.lang 2005-12-30 17:18:53.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/ada.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Ada" version="1.0" _section="Sources" mimetypes="text/x-ada;text/x-adasrc">
+<language _name="Ada" version="1.0" _section="Sources" mimetypes="text/x-adasrc">
<line-comment _name = "Line Comment" style= "Comment">
<start-regex>--</start-regex>
diff -pruN 1.8.2-1/gtksourceview/language-specs/c.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/c.lang
--- 1.8.2-1/gtksourceview/language-specs/c.lang 2004-04-19 03:02:56.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/c.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="C" version="1.0" _section="Sources" mimetypes="text/x-c;text/x-chdr;text/x-csrc">
+<language _name="C" version="1.0" _section="Sources" mimetypes="text/x-csrc;text/x-chdr">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/cpp.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/cpp.lang
--- 1.8.2-1/gtksourceview/language-specs/cpp.lang 2004-10-07 12:24:07.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/cpp.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<language _name="C++" version="1.0" _section="Sources"
- mimetypes="text/x-c++;text/x-cpp;text/x-c-header;text/x-c++src;text/x-c++hdr">
+ mimetypes="text/x-c++src;text/x-c++hdr">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/csharp.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/csharp.lang
--- 1.8.2-1/gtksourceview/language-specs/csharp.lang 2005-08-03 18:04:10.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/csharp.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="C#" version="1.0" _section="Sources" mimetypes="text/x-csharpsrc;text/x-csharp">
+<language _name="C#" version="1.0" _section="Sources" mimetypes="text/x-csharp">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/desktop.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/desktop.lang
--- 1.8.2-1/gtksourceview/language-specs/desktop.lang 2006-04-09 14:53:36.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/desktop.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name=".desktop" version="1.0" _section="Others" mimetypes="application/x-gnome-app-info;application/x-desktop">
+<language _name=".desktop" version="1.0" _section="Others" mimetypes="application/x-desktop;application/x-gnome-app-info">
<line-comment _name = "Line Comment" style= "Comment">
<start-regex>#</start-regex>
diff -pruN 1.8.2-1/gtksourceview/language-specs/diff.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/diff.lang
--- 1.8.2-1/gtksourceview/language-specs/diff.lang 2003-05-26 15:50:09.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/diff.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Diff" version="1.0" _section="Others" mimetypes="text/x-diff;text/x-patch">
+<language _name="Diff" version="1.0" _section="Others" mimetypes="text/x-patch">
<pattern-item _name="Removed line" style="Others 3">
<regex>^(<|-)[^\n]*\n</regex>
diff -pruN 1.8.2-1/gtksourceview/language-specs/docbook.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/docbook.lang
--- 1.8.2-1/gtksourceview/language-specs/docbook.lang 1970-01-01 01:00:00.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/docbook.lang 2007-01-03 15:40:26.000000000 +0000
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language _name="DocBook" version="1.0" _section="Markup" mimetypes="application/docbook+xml">
+
+ <block-comment _name="Block Comment" style="Comment">
+ <start-regex><!--</start-regex>
+ <end-regex>--></end-regex>
+ </block-comment>
+
+ <syntax-item name="DOCTYPE" style="String">
+ <start-regex><!DOCTYPE</start-regex>
+ <end-regex>(\[.*\])?></end-regex>
+ </syntax-item>
+
+ <syntax-item name="Entity definition" style="String">
+ <start-regex><!ENTITY</start-regex>
+ <end-regex>"></end-regex>
+ </syntax-item>
+
+ <pattern-item _name="Entity" style="Keyword">
+ <regex>(&|%)[a-zA-Z0-9#][a-zA-Z0-9]*;</regex>
+ </pattern-item>
+
+ <syntax-item name="CDATA" style="String">
+ <start-regex><!\[CDATA\[</start-regex>
+ <end-regex>\]\]></end-regex>
+ </syntax-item>
+
+ <pattern-item _name="String" style="String">
+ <regex>("[^<"]*")|('[^<']*')</regex>
+ </pattern-item>
+
+ <pattern-item _name="Closing Bracket" style="Others 2">
+ <regex>\??></regex>
+ </pattern-item>
+
+ <keyword-list _name="Header Elements" style="Keyword" case-sensitive="FALSE"
+ match-empty-string-at-beginning = "FALSE"
+ match-empty-string-at-end = "FALSE"
+ beginning-regex="</?"
+ end-regex="(\b|>)">
+ <keyword>abstract</keyword>
+ <keyword>article</keyword>
+ <keyword>articleinfo</keyword>
+ <keyword>bookinfo</keyword>
+ <keyword>author</keyword>
+ <keyword>authorgroup</keyword>
+ <keyword>affiliation</keyword>
+ <keyword>copyright</keyword>
+ <keyword>date</keyword>
+ <keyword>email</keyword>
+ <keyword>firstname</keyword>
+ <keyword>orgname</keyword>
+ <keyword>publisher</keyword>
+ <keyword>publishername</keyword>
+ <keyword>pubdate</keyword>
+ <keyword>pubsnumber</keyword>
+ <keyword>releaseinfo</keyword>
+ <keyword>surname</keyword>
+ <keyword>revdescription</keyword>
+ <keyword>revhistory</keyword>
+ <keyword>revision</keyword>
+ <keyword>revnumber</keyword>
+ </keyword-list>
+
+ <keyword-list _name="Formatting Elements" style="Keyword" case-sensitive="FALSE"
+ match-empty-string-at-beginning = "FALSE"
+ match-empty-string-at-end = "FALSE"
+ beginning-regex="</?"
+ end-regex="(\b|>)">
+
+ <keyword>caution</keyword>
+ <keyword>command</keyword>
+ <keyword>computeroutput</keyword>
+ <keyword>filename</keyword>
+ <keyword>firstterm</keyword>
+ <keyword>link</keyword>
+ <keyword>note</keyword>
+ <keyword>option</keyword>
+ <keyword>para</keyword>
+ <keyword>remark</keyword>
+ <keyword>replaceable</keyword>
+ <keyword>tip</keyword>
+ <keyword>ulink</keyword>
+ <keyword>variablelist</keyword>
+ <keyword>varlistentry</keyword>
+ <keyword>warning</keyword>
+ <keyword>xref</keyword>
+ </keyword-list>
+
+ <keyword-list _name="GUI Elements" style="Keyword" case-sensitive="FALSE"
+ match-empty-string-at-beginning = "FALSE"
+ match-empty-string-at-end = "FALSE"
+ beginning-regex="</?"
+ end-regex="(\b|>)">
+
+ <keyword>accel</keyword>
+ <keyword>application</keyword>
+ <keyword>guibutton</keyword>
+ <keyword>guiicon</keyword>
+ <keyword>guilabel</keyword>
+ <keyword>guimenuitem</keyword>
+ <keyword>guimenu</keyword>
+ <keyword>guisubmenu</keyword>
+ <keyword>interface</keyword>
+ <keyword>keycap</keyword>
+ <keyword>keycombo</keyword>
+ <keyword>keysym</keyword>
+ <keyword>menuchoice</keyword>
+ </keyword-list>
+
+ <keyword-list _name="Structural Elements" style="Keyword" case-sensitive="FALSE"
+ match-empty-string-at-beginning = "FALSE"
+ match-empty-string-at-end = "FALSE"
+ beginning-regex="</?"
+ end-regex="(\b|>)">
+
+ <keyword>appendix</keyword>
+ <keyword>book</keyword>
+ <keyword>chapter</keyword>
+ <keyword>anchor</keyword>
+ <keyword>citetitle</keyword>
+ <keyword>colspec</keyword>
+ <keyword>emphasis</keyword>
+ <keyword>entry</keyword>
+ <keyword>figure</keyword>
+ <keyword>glossary</keyword>
+ <keyword>glossdef</keyword>
+ <keyword>glossentry</keyword>
+ <keyword>glossterm</keyword>
+ <keyword>sect1</keyword>
+ <keyword>sect2</keyword>
+ <keyword>sect3</keyword>
+ <keyword>sect4</keyword>
+ <keyword>section</keyword>
+
+ <keyword>highlights</keyword>
+ <keyword>holder</keyword>
+ <keyword>imagedata</keyword>
+ <keyword>imageobject</keyword>
+ <keyword>indexterm</keyword>
+ <keyword>informaltable</keyword>
+ <keyword>inlinemediaobject</keyword>
+ <keyword>itemizedlist</keyword>
+ <keyword>literal</keyword>
+ <keyword>legalnotice</keyword>
+ <keyword>listitem</keyword>
+ <keyword>mediaobject</keyword>
+ <keyword>orderedlist</keyword>
+ <keyword>phrase</keyword>
+ <keyword>primary</keyword>
+ <keyword>programlisting</keyword>
+
+ <keyword>row</keyword>
+ <keyword>screen</keyword>
+ <keyword>screenshot</keyword>
+ <keyword>secondary</keyword>
+ <keyword>see</keyword>
+ <keyword>shortcut</keyword>
+
+ <keyword>table</keyword>
+ <keyword>tbody</keyword>
+ <keyword>term</keyword>
+ <keyword>tertiary</keyword>
+ <keyword>textobject</keyword>
+ <keyword>tgroup</keyword>
+ <keyword>thead</keyword>
+ <keyword>title</keyword>
+ <keyword>titleabbrev</keyword>
+ <keyword>uri</keyword>
+ <keyword>userinput</keyword>
+ <keyword>year</keyword>
+
+ <keyword>ackno</keyword>
+ <keyword>acronym</keyword>
+ <keyword>action</keyword>
+ <keyword>address</keyword>
+ <keyword>answer</keyword>
+ <keyword>appendixinfo</keyword>
+ <keyword>area</keyword>
+ <keyword>areaset</keyword>
+ <keyword>areaspec</keyword>
+ <keyword>arg</keyword>
+ <keyword>artpagenums</keyword>
+ <keyword>attribution</keyword>
+ <keyword>audiodata</keyword>
+ <keyword>audioobject</keyword>
+ <keyword>authorblurb</keyword>
+ <keyword>authorinitials</keyword>
+ <keyword>beginpage</keyword>
+ <keyword>bibliocoverage</keyword>
+ <keyword>bibliodiv</keyword>
+ <keyword>biblioentry</keyword>
+ <keyword>bibliography</keyword>
+ <keyword>bibliographyinfo</keyword>
+ <keyword>biblioid</keyword>
+ <keyword>bibliomisc</keyword>
+ <keyword>bibliomixed</keyword>
+ <keyword>bibliomset</keyword>
+ <keyword>bibliorelation</keyword>
+ <keyword>biblioset</keyword>
+ <keyword>bibliosource</keyword>
+ <keyword>blockinfo</keyword>
+ <keyword>blockquote</keyword>
+ <keyword>bridgehead</keyword>
+ <keyword>callout</keyword>
+ <keyword>calloutlist</keyword>
+ <keyword>caption</keyword>
+ <keyword>chapterinfo</keyword>
+ <keyword>citation</keyword>
+ <keyword>citebiblioid</keyword>
+ <keyword>citerefentry</keyword>
+ <keyword>city</keyword>
+ <keyword>classname</keyword>
+ <keyword>classsynopsis</keyword>
+ <keyword>classsynopsisinfo</keyword>
+ <keyword>cmdsynopsis</keyword>
+ <keyword>code</keyword>
+ <keyword>colgroup</keyword>
+ <keyword>collab</keyword>
+ <keyword>collabname</keyword>
+ <keyword>colophon</keyword>
+ <keyword>confdates</keyword>
+ <keyword>confgroup</keyword>
+ <keyword>confnum</keyword>
+ <keyword>confsponsor</keyword>
+ <keyword>conftitle</keyword>
+ <keyword>constant</keyword>
+ <keyword>constraint</keyword>
+ <keyword>constraintdef</keyword>
+ <keyword>constructorsynopsis</keyword>
+ <keyword>contractnum</keyword>
+ <keyword>contractsponsor</keyword>
+ <keyword>contrib</keyword>
+ <keyword>coref</keyword>
+ <keyword>corpauthor</keyword>
+ <keyword>corpcredit</keyword>
+ <keyword>corpname</keyword>
+ <keyword>country</keyword>
+ <keyword>database</keyword>
+ <keyword>dedication</keyword>
+ <keyword>destructorsynopsis</keyword>
+ <keyword>edition</keyword>
+ <keyword>editor</keyword>
+ <keyword>entrytbl</keyword>
+ <keyword>envar</keyword>
+ <keyword>epigraph</keyword>
+ <keyword>equation</keyword>
+ <keyword>errorcode</keyword>
+ <keyword>errorname</keyword>
+ <keyword>errortext</keyword>
+ <keyword>errortype</keyword>
+ <keyword>example</keyword>
+ <keyword>exceptionname</keyword>
+ <keyword>fax</keyword>
+ <keyword>fieldsynopsis</keyword>
+ <keyword>footnote</keyword>
+ <keyword>footnoteref</keyword>
+ <keyword>foreignphrase</keyword>
+ <keyword>formalpara</keyword>
+ <keyword>funcdef</keyword>
+ <keyword>funcparams</keyword>
+ <keyword>funcprototype</keyword>
+ <keyword>funcsynopsis</keyword>
+ <keyword>funcsynopsisinfo</keyword>
+ <keyword>function</keyword>
+ <keyword>glossaryinfo</keyword>
+ <keyword>glossdiv</keyword>
+ <keyword>glosslist</keyword>
+ <keyword>glosssee</keyword>
+ <keyword>glossseealso</keyword>
+ <keyword>graphic</keyword>
+ <keyword>graphicco</keyword>
+ <keyword>hardware</keyword>
+ <keyword>honorific</keyword>
+ <keyword>imageobjectco</keyword>
+ <keyword>important</keyword>
+ <keyword>indexdiv</keyword>
+ <keyword>indexentry</keyword>
+ <keyword>indexinfo</keyword>
+ <keyword>informalequation</keyword>
+ <keyword>informalexample</keyword>
+ <keyword>informalfigure</keyword>
+ <keyword>initializer</keyword>
+ <keyword>inlineequation</keyword>
+ <keyword>inlinegraphic</keyword>
+ <keyword>interfacename</keyword>
+ <keyword>invpartnumber</keyword>
+ <keyword>isbn</keyword>
+ <keyword>issn</keyword>
+ <keyword>issuenum</keyword>
+ <keyword>itermset</keyword>
+ <keyword>jobtitle</keyword>
+ <keyword>keycode</keyword>
+ <keyword>keyword</keyword>
+ <keyword>keywordset</keyword>
+ <keyword>lhs</keyword>
+ <keyword>lineage</keyword>
+ <keyword>lineannotation</keyword>
+ <keyword>literallayout</keyword>
+ <keyword>lot</keyword>
+ <keyword>lotentry</keyword>
+ <keyword>manvolnum</keyword>
+ <keyword>markup</keyword>
+ <keyword>medialabel</keyword>
+ <keyword>mediaobjectco</keyword>
+ <keyword>member</keyword>
+ <keyword>methodname</keyword>
+ <keyword>methodparam</keyword>
+ <keyword>methodsynopsis</keyword>
+ <keyword>modespec</keyword>
+ <keyword>modifier</keyword>
+ <keyword>mousebutton</keyword>
+ <keyword>msg</keyword>
+ <keyword>msgaud</keyword>
+ <keyword>msgentry</keyword>
+ <keyword>msgexplan</keyword>
+ <keyword>msginfo</keyword>
+ <keyword>msglevel</keyword>
+ <keyword>msgmain</keyword>
+ <keyword>msgorig</keyword>
+ <keyword>msgrel</keyword>
+ <keyword>msgset</keyword>
+ <keyword>msgsub</keyword>
+ <keyword>msgtext</keyword>
+ <keyword>nonterminal</keyword>
+ <keyword>objectinfo</keyword>
+ <keyword>olink</keyword>
+ <keyword>ooclass</keyword>
+ <keyword>ooexception</keyword>
+ <keyword>oointerface</keyword>
+ <keyword>optional</keyword>
+ <keyword>orgdiv</keyword>
+ <keyword>otheraddr</keyword>
+ <keyword>othercredit</keyword>
+ <keyword>othername</keyword>
+ <keyword>pagenums</keyword>
+ <keyword>paramdef</keyword>
+ <keyword>parameter</keyword>
+ <keyword>part</keyword>
+ <keyword>partinfo</keyword>
+ <keyword>partintro</keyword>
+ <keyword>personblurb</keyword>
+ <keyword>personname</keyword>
+ <keyword>phone</keyword>
+ <keyword>pob</keyword>
+ <keyword>postcode</keyword>
+ <keyword>preface</keyword>
+ <keyword>prefaceinfo</keyword>
+ <keyword>primaryie</keyword>
+ <keyword>printhistory</keyword>
+ <keyword>procedure</keyword>
+ <keyword>production</keyword>
+ <keyword>productionrecap</keyword>
+ <keyword>productionset</keyword>
+ <keyword>productname</keyword>
+ <keyword>productnumber</keyword>
+
+ </keyword-list>
+ <!-- This split keeps each keyword-list under 250 elements.
+ See bug #110991 for further details.
+ -->
+
+ <keyword-list _name="Structural Elements 2" style="Keyword" case-sensitive="FALSE"
+ match-empty-string-at-beginning = "FALSE"
+ match-empty-string-at-end = "FALSE"
+ beginning-regex="</?"
+ end-regex="(\b|>)">
+
+ <keyword>programlistingco</keyword>
+ <keyword>prompt</keyword>
+ <keyword>property</keyword>
+ <keyword>qandadiv</keyword>
+ <keyword>qandaentry</keyword>
+ <keyword>qandaset</keyword>
+ <keyword>question</keyword>
+ <keyword>quote</keyword>
+ <keyword>refclass</keyword>
+ <keyword>refdescriptor</keyword>
+ <keyword>refentry</keyword>
+ <keyword>refentryinfo</keyword>
+ <keyword>refentrytitle</keyword>
+ <keyword>reference</keyword>
+ <keyword>referenceinfo</keyword>
+ <keyword>refmeta</keyword>
+ <keyword>refmiscinfo</keyword>
+ <keyword>refname</keyword>
+ <keyword>refnamediv</keyword>
+ <keyword>refpurpose</keyword>
+ <keyword>refsect1</keyword>
+ <keyword>refsect1info</keyword>
+ <keyword>refsect2</keyword>
+ <keyword>refsect2info</keyword>
+ <keyword>refsect3</keyword>
+ <keyword>refsect3info</keyword>
+ <keyword>refsection</keyword>
+ <keyword>refsectioninfo</keyword>
+ <keyword>refsynopsisdiv</keyword>
+ <keyword>refsynopsisdivinfo</keyword>
+ <keyword>returnvalue</keyword>
+ <keyword>revremark</keyword>
+ <keyword>rhs</keyword>
+ <keyword>sbr</keyword>
+ <keyword>screenco</keyword>
+ <keyword>screeninfo</keyword>
+ <keyword>secondaryie</keyword>
+ <keyword>sect1info</keyword>
+ <keyword>sect2info</keyword>
+ <keyword>sect3info</keyword>
+ <keyword>sect4info</keyword>
+ <keyword>sect5</keyword>
+ <keyword>sect5info</keyword>
+ <keyword>sectioninfo</keyword>
+ <keyword>seealso</keyword>
+ <keyword>seealsoie</keyword>
+ <keyword>seeie</keyword>
+ <keyword>seg</keyword>
+ <keyword>seglistitem</keyword>
+ <keyword>segmentedlist</keyword>
+ <keyword>segtitle</keyword>
+ <keyword>seriesvolnums</keyword>
+ <keyword>set</keyword>
+ <keyword>setindex</keyword>
+ <keyword>setindexinfo</keyword>
+ <keyword>setinfo</keyword>
+ <keyword>sgmltag</keyword>
+ <keyword>shortaffil</keyword>
+ <keyword>sidebar</keyword>
+ <keyword>sidebarinfo</keyword>
+ <keyword>simpara</keyword>
+ <keyword>simplelist</keyword>
+ <keyword>simplemsgentry</keyword>
+ <keyword>simplesect</keyword>
+ <keyword>spanspec</keyword>
+ <keyword>state</keyword>
+ <keyword>step</keyword>
+ <keyword>stepalternatives</keyword>
+ <keyword>street</keyword>
+ <keyword>structfield</keyword>
+ <keyword>structname</keyword>
+ <keyword>subject</keyword>
+ <keyword>subjectset</keyword>
+ <keyword>subjectterm</keyword>
+ <keyword>subscript</keyword>
+ <keyword>substeps</keyword>
+ <keyword>subtitle</keyword>
+ <keyword>superscript</keyword>
+ <keyword>symbol</keyword>
+ <keyword>synopfragment</keyword>
+ <keyword>synopfragmentref</keyword>
+ <keyword>synopsis</keyword>
+ <keyword>systemitem</keyword>
+ <keyword>task</keyword>
+ <keyword>taskprerequisites</keyword>
+ <keyword>taskrelated</keyword>
+ <keyword>tasksummary</keyword>
+ <keyword>td</keyword>
+ <keyword>tertiaryie</keyword>
+ <keyword>textdata</keyword>
+ <keyword>tfoot</keyword>
+ <keyword>toc</keyword>
+ <keyword>tocback</keyword>
+ <keyword>tocchap</keyword>
+ <keyword>tocentry</keyword>
+ <keyword>tocfront</keyword>
+ <keyword>toclevel</keyword>
+ <keyword>tocpart</keyword>
+ <keyword>token</keyword>
+ <keyword>trademark</keyword>
+ <keyword>type</keyword>
+ <keyword>varargs</keyword>
+ <keyword>varname</keyword>
+ <keyword>videodata</keyword>
+ <keyword>videoobject</keyword>
+ <keyword>void</keyword>
+ <keyword>volumenum</keyword>
+ <keyword>wordasword</keyword>
+
+ </keyword-list>
+
+
+ <pattern-item _name="Attribute" style = "Others">
+ <regex>[ \t][a-zA-Z_:][a-zA-Z0-9_:-]*\b[ \t]*=</regex>
+ </pattern-item>
+
+ <pattern-item _name ="Hexadecimal" style = "Base-N Integer">
+ <regex>#[a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]</regex>
+ </pattern-item>
+
+</language>
diff -pruN 1.8.2-1/gtksourceview/language-specs/javascript.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/javascript.lang
--- 1.8.2-1/gtksourceview/language-specs/javascript.lang 2005-10-18 15:52:48.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/javascript.lang 2007-01-03 15:40:26.000000000 +0000
@@ -11,7 +11,7 @@
Submitted by Scott Martin (scott coffeeblack org)
-->
-<language _name="JavaScript" version="1.0" _section="Scripts" mimetypes="text/x-javascript;text/javascript;text/x-js;application/x-javascript">
+<language _name="JavaScript" version="1.0" _section="Scripts" mimetypes="application/x-javascript">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/Makefile.am 1.8.3-0ubuntu1/gtksourceview/language-specs/Makefile.am
--- 1.8.2-1/gtksourceview/language-specs/Makefile.am 2006-12-11 01:18:30.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/Makefile.am 2007-01-08 17:54:59.000000000 +0000
@@ -11,6 +11,7 @@ EXTRA_DIST = \
d.lang \
desktop.lang \
diff.lang \
+ docbook.lang \
fortran.lang \
gtkrc.lang \
haskell.lang \
@@ -24,6 +25,7 @@ EXTRA_DIST = \
makefile.lang \
msil.lang \
nemerle.lang \
+ ocaml.lang \
octave.lang \
pascal.lang \
perl.lang \
diff -pruN 1.8.2-1/gtksourceview/language-specs/Makefile.in 1.8.3-0ubuntu1/gtksourceview/language-specs/Makefile.in
--- 1.8.2-1/gtksourceview/language-specs/Makefile.in 2006-12-13 12:03:11.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/Makefile.in 2007-01-08 19:49:16.000000000 +0000
@@ -109,6 +109,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -183,13 +184,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -206,23 +203,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -240,6 +244,7 @@ EXTRA_DIST = \
d.lang \
desktop.lang \
diff.lang \
+ docbook.lang \
fortran.lang \
gtkrc.lang \
haskell.lang \
@@ -253,6 +258,7 @@ EXTRA_DIST = \
makefile.lang \
msil.lang \
nemerle.lang \
+ ocaml.lang \
octave.lang \
pascal.lang \
perl.lang \
diff -pruN 1.8.2-1/gtksourceview/language-specs/ocaml.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/ocaml.lang
--- 1.8.2-1/gtksourceview/language-specs/ocaml.lang 1970-01-01 01:00:00.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/ocaml.lang 2007-01-08 18:06:08.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language _name="Objective Caml" version="1.0" _section="Sources" mimetypes="text/x-ocaml">
+
+ <escape-char>\</escape-char>
+
+ <block-comment _name = "Comment" style = "Comment">
+ <start-regex>\(\*</start-regex>
+ <end-regex>\*\)</end-regex>
+ </block-comment>
+
+ <pattern-item _name = "Decimal" style = "Decimal">
+ <regex>\b[-]?[0-9][0-9_]*[lL]?\b</regex>
+ </pattern-item>
+
+ <pattern-item _name = "Hex Number" style = "Base-N Integer">
+ <regex>\b[-]?0[xX][0-9A-Fa-f][0-9A-Fa-f_]*[lL]?\b</regex>
+ </pattern-item>
+
+ <pattern-item _name = "Octal Number" style = "Base-N Integer">
+ <regex>\b[-]?0[oO][0-7][0-7_]*[lL]?\b</regex>
+ </pattern-item>
+
+ <pattern-item _name = "Binary Number" style = "Base-N Integer">
+ <regex>\b[-]?0[bB][01][01_]*[lL]?\b</regex>
+ </pattern-item>
+
+ <pattern-item _name = "Floating Point Number" style = "Floating Point">
+ <regex>\b[-]?[0-9][0-9_]*(\.[0-9_]*)?([Ee][+-]?[0-9][0-9_]*)?</regex>
+ </pattern-item>
+
+ <string _name = "Character Constant" style = "String" end-at-line-end = "TRUE">
+ <start-regex>'</start-regex>
+ <end-regex>'</end-regex>
+ </string>
+
+ <string _name = "String" style = "String" end-at-line-end = "FALSE">
+ <start-regex>"</start-regex>
+ <end-regex>"</end-regex>
+ </string>
+
+ <keyword-list _name = "Boolean Constant" style = "String" case-sensitive="FALSE">
+ <keyword>true</keyword>
+ <keyword>false</keyword>
+ </keyword-list>
+
+ <pattern-item _name = "Module" style = "Data Type">
+ <regex>\b[A-Z][A-Za-z0-9_']*</regex>
+ </pattern-item>
+
+ <pattern-item _name = "Label" style = "Data Type">
+ <regex>[~?][a-z][A-Za-z0-9_']*</regex>
+ </pattern-item>
+
+ <keyword-list _name = "Keywords" style = "Keyword" case-sensitive="TRUE">
+ <keyword>asm</keyword>
+ <keyword>break</keyword>
+ <keyword>case</keyword>
+ <keyword>continue</keyword>
+ <keyword>default</keyword>
+ <keyword>do</keyword>
+ <keyword>else</keyword>
+ <keyword>for</keyword>
+ <keyword>fortran</keyword>
+ <keyword>goto</keyword>
+ <keyword>if</keyword>
+ <keyword>return</keyword>
+ <keyword>sizeof</keyword>
+ <keyword>switch</keyword>
+ <keyword>while</keyword>
+ <keyword>and</keyword>
+ <keyword>as</keyword>
+ <keyword>assert</keyword>
+ <keyword>asr</keyword>
+ <keyword>begin</keyword>
+ <keyword>class</keyword>
+ <keyword>constraint</keyword>
+ <keyword>do</keyword>
+ <keyword>done</keyword>
+ <keyword>downto</keyword>
+ <keyword>else</keyword>
+ <keyword>end</keyword>
+ <keyword>exception</keyword>
+ <keyword>external</keyword>
+ <keyword>for</keyword>
+ <keyword>fun</keyword>
+ <keyword>function</keyword>
+ <keyword>functor</keyword>
+ <keyword>if</keyword>
+ <keyword>in</keyword>
+ <keyword>include</keyword>
+ <keyword>inherit</keyword>
+ <keyword>initializer</keyword>
+ <keyword>land</keyword>
+ <keyword>lazy</keyword>
+ <keyword>let</keyword>
+ <keyword>lor</keyword>
+ <keyword>lsl</keyword>
+ <keyword>lsr</keyword>
+ <keyword>lxor</keyword>
+ <keyword>match</keyword>
+ <keyword>method</keyword>
+ <keyword>mod</keyword>
+ <keyword>module</keyword>
+ <keyword>mutable</keyword>
+ <keyword>new</keyword>
+ <keyword>object</keyword>
+ <keyword>of</keyword>
+ <keyword>open</keyword>
+ <keyword>or</keyword>
+ <keyword>private</keyword>
+ <keyword>rec</keyword>
+ <keyword>sig</keyword>
+ <keyword>struct</keyword>
+ <keyword>then</keyword>
+ <keyword>to</keyword>
+ <keyword>try</keyword>
+ <keyword>type</keyword>
+ <keyword>val</keyword>
+ <keyword>virtual</keyword>
+ <keyword>when</keyword>
+ <keyword>while</keyword>
+ <keyword>with</keyword>
+ </keyword-list>
+</language>
diff -pruN 1.8.2-1/gtksourceview/language-specs/perl.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/perl.lang
--- 1.8.2-1/gtksourceview/language-specs/perl.lang 2006-03-17 11:43:22.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/perl.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Perl" version="1.0" _section="Scripts" mimetypes="text/x-perl;application/x-perl">
+<language _name="Perl" version="1.0" _section="Scripts" mimetypes="application/x-perl">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/php.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/php.lang
--- 1.8.2-1/gtksourceview/language-specs/php.lang 2006-03-15 11:19:32.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/php.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- <!DOCTYPE language SYSTEM "language.dtd"> -->
-<language _name="PHP" version="1.0" _section="Scripts" mimetypes="text/x-php;application/x-php;text/x-php-source;application/x-php-source">
+<!DOCTYPE language SYSTEM "language.dtd">
+<language _name="PHP" version="1.0" _section="Scripts" mimetypes="application/x-php">
<!-- FIXME: keywords before a '(' is hightlined as a function call instead of a keyword -->
diff -pruN 1.8.2-1/gtksourceview/language-specs/po.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/po.lang
--- 1.8.2-1/gtksourceview/language-specs/po.lang 2006-08-23 15:35:26.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/po.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<language _name="gettext translation" version="1.0" _section="Others"
- mimetypes="text/x-po;text/x-pot;text/x-pox;text/x-gettext-translation;text/x-gettext-translation-template">
-
+ mimetypes="text/x-gettext-translation;text/x-gettext-translation-template">
<escape-char>\</escape-char>
<string _name = "String" style = "String" end-at-line-end = "FALSE">
diff -pruN 1.8.2-1/gtksourceview/language-specs/python.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/python.lang
--- 1.8.2-1/gtksourceview/language-specs/python.lang 2006-01-11 11:45:50.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/python.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Python" version="1.0" _section="Scripts" mimetypes="text/x-python;application/x-python">
+<language _name="Python" version="1.0" _section="Scripts" mimetypes="text/x-python">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/ruby.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/ruby.lang
--- 1.8.2-1/gtksourceview/language-specs/ruby.lang 2006-04-06 15:24:19.000000000 +0100
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/ruby.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Ruby" version="1.0" _section="Scripts" mimetypes="application/x-ruby;text/x-ruby">
+<language _name="Ruby" version="1.0" _section="Scripts" mimetypes="application/x-ruby">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/sh.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/sh.lang
--- 1.8.2-1/gtksourceview/language-specs/sh.lang 2006-01-07 15:09:10.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/sh.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="sh" version="1.0" _section="Scripts" mimetypes="text/x-shellscript;application/x-shellscript;text/x-sh">
+<language _name="sh" version="1.0" _section="Scripts" mimetypes="application/x-shellscript">
<!--
Author: Silian Della Ragione (silian87 gechi it)
Contribs: Paolo Maggi (paolo gnome org)
diff -pruN 1.8.2-1/gtksourceview/language-specs/tcl.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/tcl.lang
--- 1.8.2-1/gtksourceview/language-specs/tcl.lang 2006-01-07 15:09:10.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/tcl.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Tcl" version="1.0" _section="Scripts" mimetypes="text/x-tcl;application/x-tcl">
+<language _name="Tcl" version="1.0" _section="Scripts" mimetypes="text/x-tcl">
<escape-char>\</escape-char>
diff -pruN 1.8.2-1/gtksourceview/language-specs/xml.lang 1.8.3-0ubuntu1/gtksourceview/language-specs/xml.lang
--- 1.8.2-1/gtksourceview/language-specs/xml.lang 2006-12-11 11:07:46.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/language-specs/xml.lang 2007-01-03 15:40:26.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="XML" version="1.0" _section="Markup" mimetypes="application/xml;text/xml;image/svg+xml;text/rdf;text/xsl">
+<language _name="XML" version="1.0" _section="Markup" mimetypes="application/xml;text/xml">
<block-comment _name="Block Comment" style="Comment">
<start-regex><!--</start-regex>
diff -pruN 1.8.2-1/gtksourceview/Makefile.in 1.8.3-0ubuntu1/gtksourceview/Makefile.in
--- 1.8.2-1/gtksourceview/Makefile.in 2006-12-13 12:03:10.000000000 +0000
+++ 1.8.3-0ubuntu1/gtksourceview/Makefile.in 2007-01-08 19:49:15.000000000 +0000
@@ -173,6 +173,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -247,13 +248,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -270,23 +267,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -pruN 1.8.2-1/intltool-extract.in 1.8.3-0ubuntu1/intltool-extract.in
--- 1.8.2-1/intltool-extract.in 2006-12-13 12:02:59.000000000 +0000
+++ 1.8.3-0ubuntu1/intltool-extract.in 2007-01-08 19:49:12.000000000 +0000
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.1";
+my $VERSION = "0.35.2";
## Loaded modules
use strict;
@@ -114,6 +114,11 @@ sub split_on_argument {
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 {
diff -pruN 1.8.2-1/intltool-merge.in 1.8.3-0ubuntu1/intltool-merge.in
--- 1.8.2-1/intltool-merge.in 2006-12-13 12:02:59.000000000 +0000
+++ 1.8.3-0ubuntu1/intltool-merge.in 2007-01-08 19:49:12.000000000 +0000
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.1";
+my $VERSION = "0.35.2";
## Loaded modules
use strict;
diff -pruN 1.8.2-1/intltool-update.in 1.8.3-0ubuntu1/intltool-update.in
--- 1.8.2-1/intltool-update.in 2006-12-13 12:02:59.000000000 +0000
+++ 1.8.3-0ubuntu1/intltool-update.in 2007-01-08 19:49:12.000000000 +0000
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.1";
+my $VERSION = "0.35.2";
my $PACKAGE = "intltool";
## Loaded modules
@@ -90,10 +90,9 @@ my $buildin_gettext_support =
$| = 1;
## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
my $POTFILES_in;
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
$POTFILES_in = "<$SRCDIR/POTFILES.in";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -419,7 +418,7 @@ sub FindLeftoutFiles
}
}
- if (/\.GetString ?\(QUOTEDTEXT/)
+ if (/\w\.GetString *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -428,7 +427,8 @@ sub FindLeftoutFiles
last;
}
- if (/_\(QUOTEDTEXT/)
+ ## N_ Q_ and _ are the three macros defined in gi8n.h
+ if (/[NQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -506,7 +506,7 @@ sub FindLeftoutFiles
foreach (@buf_potfiles_sorted)
{
chomp (my $dummy = $_);
- if ("$dummy" ne "" and ! -f "../$dummy")
+ if ("$dummy" ne "" and ! -f "$SRCDIR/../$dummy")
{
push @buf_potfiles_notexist, $_;
}
@@ -673,12 +673,8 @@ sub GeneratePOTemplate
}
else
{
- if ($SRCDIR eq ".") {
- print OUTFILE "../$_\n";
- } else {
- print OUTFILE "$SRCDIR/../$_\n";
- }
- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ print OUTFILE "$SRCDIR/../$_\n";
+ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
}
next if (! $gettext_support_nonascii);
diff -pruN 1.8.2-1/Makefile.in 1.8.3-0ubuntu1/Makefile.in
--- 1.8.2-1/Makefile.in 2006-12-13 12:03:11.000000000 +0000
+++ 1.8.3-0ubuntu1/Makefile.in 2007-01-08 19:49:16.000000000 +0000
@@ -135,6 +135,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -209,13 +210,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -232,23 +229,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -pruN 1.8.2-1/NEWS 1.8.3-0ubuntu1/NEWS
--- 1.8.2-1/NEWS 2006-12-13 12:00:57.000000000 +0000
+++ 1.8.3-0ubuntu1/NEWS 2007-01-08 19:42:50.000000000 +0000
@@ -1,3 +1,11 @@
+News in 1.8.3
+-------------
+
+* Added docbook lang file (Joachim Noreiko)
+* Added OCaml lang file (Eric Cooper)
+* Cleanup some mime types in lang files (Paolo Maggi)
+* Updated translations
+
News in 1.8.2
-------------
diff -pruN 1.8.2-1/po/ar.po 1.8.3-0ubuntu1/po/ar.po
--- 1.8.2-1/po/ar.po 2006-10-30 10:09:08.000000000 +0000
+++ 1.8.3-0ubuntu1/po/ar.po 2007-01-03 15:40:34.000000000 +0000
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gtksourceview\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 00:54+0000\n"
+"POT-Creation-Date: 2006-12-27 16:32+0000\n"
"PO-Revision-Date: 2006-10-05 21:07-0000\n"
"Last-Translator: Djihed Afifi <djihed gmail com>\n"
"Language-Team: Arabic <support arabeyes org>\n"
@@ -279,6 +279,7 @@ msgstr "Preprocessor"
#: ../gtksourceview/language-specs/cpp.lang.h:15
#: ../gtksourceview/language-specs/csharp.lang.h:9
#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/docbook.lang.h:11
#: ../gtksourceview/language-specs/html.lang.h:8
#: ../gtksourceview/language-specs/fortran.lang.h:14
#: ../gtksourceview/language-specs/haskell.lang.h:31
@@ -602,6 +603,7 @@ msgstr "تعÙ?Ù?Ù? '#if 0'"
#: ../gtksourceview/language-specs/csharp.lang.h:1
#: ../gtksourceview/language-specs/css.lang.h:9
#: ../gtksourceview/language-specs/d.lang.h:2
+#: ../gtksourceview/language-specs/docbook.lang.h:2
#: ../gtksourceview/language-specs/html.lang.h:2
#: ../gtksourceview/language-specs/haskell.lang.h:1
#: ../gtksourceview/language-specs/idl.lang.h:1
@@ -934,29 +936,48 @@ msgstr "اÙ?سطر اÙ?Ù?ØØ°Ù?Ù?"
msgid "Special case"
msgstr "ØاÙ?Ø© خاصة"
+#: ../gtksourceview/language-specs/docbook.lang.h:1
#: ../gtksourceview/language-specs/html.lang.h:1
#: ../gtksourceview/language-specs/xml.lang.h:1
msgid "Attribute"
msgstr "اÙ?صÙ?Ù?Ø©"
+#: ../gtksourceview/language-specs/docbook.lang.h:3
#: ../gtksourceview/language-specs/html.lang.h:3
#: ../gtksourceview/language-specs/xml.lang.h:3
msgid "Closing Bracket"
msgstr "اÙ?Ù?Ù?س اÙ?غاÙ?Ù?"
-#: ../gtksourceview/language-specs/html.lang.h:4
-msgid "DTD"
-msgstr "DTD"
+#: ../gtksourceview/language-specs/docbook.lang.h:4
+msgid "DocBook"
+msgstr ""
+#: ../gtksourceview/language-specs/docbook.lang.h:5
#: ../gtksourceview/language-specs/html.lang.h:5
#: ../gtksourceview/language-specs/xml.lang.h:4
msgid "Entity"
msgstr "Ù?Ù?اÙ?"
-#: ../gtksourceview/language-specs/html.lang.h:6
-msgid "HTML"
-msgstr "HTML"
+#: ../gtksourceview/language-specs/docbook.lang.h:6
+#, fuzzy
+msgid "Formatting Elements"
+msgstr "تÙ?سÙ?Ù?"
+#: ../gtksourceview/language-specs/docbook.lang.h:7
+msgid "GUI Elements"
+msgstr ""
+
+#: ../gtksourceview/language-specs/docbook.lang.h:8
+#, fuzzy
+msgid "Header Elements"
+msgstr "شبÙ? اÙ?عÙ?اصر Ù?Ù?Ù?Ù?تÙ?Ù? "
+
+#: ../gtksourceview/language-specs/docbook.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "سادس عشرÙ?"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:10
#: ../gtksourceview/language-specs/html.lang.h:7
#: ../gtksourceview/language-specs/latex.lang.h:7
#: ../gtksourceview/language-specs/texinfo.lang.h:12
@@ -964,6 +985,19 @@ msgstr "HTML"
msgid "Markup"
msgstr "تعÙ?Ù?Ù?"
+#: ../gtksourceview/language-specs/docbook.lang.h:12
+#, fuzzy
+msgid "Structural Elements"
+msgstr "شبÙ? اÙ?عÙ?اصر Ù?Ù?Ù?Ù?تÙ?Ù? "
+
+#: ../gtksourceview/language-specs/html.lang.h:4
+msgid "DTD"
+msgstr "DTD"
+
+#: ../gtksourceview/language-specs/html.lang.h:6
+msgid "HTML"
+msgstr "HTML"
+
#: ../gtksourceview/language-specs/html.lang.h:9
#: ../gtksourceview/language-specs/xml.lang.h:8
msgid "Tag"
@@ -1748,10 +1782,6 @@ msgstr "True Ù? False"
msgid "VHDL"
msgstr "VHDL"
-#: ../gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "سادس عشرÙ?"
-
#: ../gtksourceview/language-specs/xml.lang.h:9
msgid "XML"
msgstr "XML"
diff -pruN 1.8.2-1/po/ChangeLog 1.8.3-0ubuntu1/po/ChangeLog
--- 1.8.2-1/po/ChangeLog 2006-12-13 12:02:33.000000000 +0000
+++ 1.8.3-0ubuntu1/po/ChangeLog 2007-01-08 19:43:01.000000000 +0000
@@ -1,3 +1,17 @@
+=== gtksourceview 1.8.3 ===
+
+2007-01-01 David Lodge <dave cirt net>
+
+ * en_GB.po: Updated English (British) translation
+
+2006-12-29 Kjartan Maraas <kmaraas gnome org>
+
+ * nb.po: Updated Norwegian bokmål translation.
+
+2006-12-27 Djihed Afifi <djihed gmail com>
+
+ * ar.po: Updated Arabic Translation.
+
=== gtksourceview 1.8.2 ===
2006-12-02 Priit Laes <plaes cvs gnome org>
diff -pruN 1.8.2-1/po/en_GB.po 1.8.3-0ubuntu1/po/en_GB.po
--- 1.8.2-1/po/en_GB.po 2006-09-14 21:10:37.000000000 +0100
+++ 1.8.3-0ubuntu1/po/en_GB.po 2007-01-03 15:40:34.000000000 +0000
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gtksourceview\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-14 21:09+0100\n"
-"PO-Revision-Date: 2006-09-14 21:09-0000\n"
+"POT-Creation-Date: 2007-01-01 22:41+0000\n"
+"PO-Revision-Date: 2007-01-01 22:41-0000\n"
"Last-Translator: David Lodge <dave cirt net>\n"
"Language-Team: English/GB <en li org>\n"
"MIME-Version: 1.0\n"
@@ -272,11 +272,12 @@ msgstr "Preprocessor"
#: ../gtksourceview/language-specs/cpp.lang.h:15
#: ../gtksourceview/language-specs/csharp.lang.h:9
#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/docbook.lang.h:11
#: ../gtksourceview/language-specs/html.lang.h:8
#: ../gtksourceview/language-specs/fortran.lang.h:14
#: ../gtksourceview/language-specs/haskell.lang.h:31
#: ../gtksourceview/language-specs/idl.lang.h:9
-#: ../gtksourceview/language-specs/java.lang.h:11
+#: ../gtksourceview/language-specs/java.lang.h:12
#: ../gtksourceview/language-specs/javascript.lang.h:23
#: ../gtksourceview/language-specs/lua.lang.h:10
#: ../gtksourceview/language-specs/makefile.lang.h:8
@@ -480,7 +481,7 @@ msgstr "Character Constant"
#: ../gtksourceview/language-specs/haskell.lang.h:10
#: ../gtksourceview/language-specs/idl.lang.h:5
#: ../gtksourceview/language-specs/ini.lang.h:8
-#: ../gtksourceview/language-specs/java.lang.h:5
+#: ../gtksourceview/language-specs/java.lang.h:6
#: ../gtksourceview/language-specs/javascript.lang.h:13
#: ../gtksourceview/language-specs/lua.lang.h:4
#: ../gtksourceview/language-specs/makefile.lang.h:4
@@ -530,7 +531,7 @@ msgstr "Preprocessor Keyword"
#: ../gtksourceview/language-specs/fortran.lang.h:13
#: ../gtksourceview/language-specs/haskell.lang.h:13
#: ../gtksourceview/language-specs/idl.lang.h:8
-#: ../gtksourceview/language-specs/java.lang.h:10
+#: ../gtksourceview/language-specs/java.lang.h:11
#: ../gtksourceview/language-specs/makefile.lang.h:6
#: ../gtksourceview/language-specs/nemerle.lang.h:14
#: ../gtksourceview/language-specs/pascal.lang.h:17
@@ -591,6 +592,7 @@ msgstr "'#if 0' Comment"
#: ../gtksourceview/language-specs/csharp.lang.h:1
#: ../gtksourceview/language-specs/css.lang.h:9
#: ../gtksourceview/language-specs/d.lang.h:2
+#: ../gtksourceview/language-specs/docbook.lang.h:2
#: ../gtksourceview/language-specs/html.lang.h:2
#: ../gtksourceview/language-specs/haskell.lang.h:1
#: ../gtksourceview/language-specs/idl.lang.h:1
@@ -710,7 +712,7 @@ msgid "Multiline String"
msgstr "Multiline String"
#: ../gtksourceview/language-specs/csharp.lang.h:7
-#: ../gtksourceview/language-specs/java.lang.h:9
+#: ../gtksourceview/language-specs/java.lang.h:10
#: ../gtksourceview/language-specs/nemerle.lang.h:13
#: ../gtksourceview/language-specs/vbnet.lang.h:9
msgid "Primitives"
@@ -719,7 +721,7 @@ msgstr "Primitives"
#: ../gtksourceview/language-specs/csharp.lang.h:10
#: ../gtksourceview/language-specs/css.lang.h:59
#: ../gtksourceview/language-specs/fortran.lang.h:15
-#: ../gtksourceview/language-specs/java.lang.h:12
+#: ../gtksourceview/language-specs/java.lang.h:13
#: ../gtksourceview/language-specs/javascript.lang.h:24
#: ../gtksourceview/language-specs/lua.lang.h:11
#: ../gtksourceview/language-specs/makefile.lang.h:9
@@ -923,29 +925,46 @@ msgstr "Removed line"
msgid "Special case"
msgstr "Special case"
+#: ../gtksourceview/language-specs/docbook.lang.h:1
#: ../gtksourceview/language-specs/html.lang.h:1
#: ../gtksourceview/language-specs/xml.lang.h:1
msgid "Attribute"
msgstr "Attribute"
+#: ../gtksourceview/language-specs/docbook.lang.h:3
#: ../gtksourceview/language-specs/html.lang.h:3
#: ../gtksourceview/language-specs/xml.lang.h:3
msgid "Closing Bracket"
msgstr "Closing Bracket"
-#: ../gtksourceview/language-specs/html.lang.h:4
-msgid "DTD"
-msgstr "DTD"
+#: ../gtksourceview/language-specs/docbook.lang.h:4
+msgid "DocBook"
+msgstr "DocBook"
+#: ../gtksourceview/language-specs/docbook.lang.h:5
#: ../gtksourceview/language-specs/html.lang.h:5
#: ../gtksourceview/language-specs/xml.lang.h:4
msgid "Entity"
msgstr "Entity"
-#: ../gtksourceview/language-specs/html.lang.h:6
-msgid "HTML"
-msgstr "HTML"
+#: ../gtksourceview/language-specs/docbook.lang.h:6
+msgid "Formatting Elements"
+msgstr "Formatting Elements"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:7
+msgid "GUI Elements"
+msgstr "GUI Elements"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:8
+msgid "Header Elements"
+msgstr "Header Elements"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "Hexadecimal"
+#: ../gtksourceview/language-specs/docbook.lang.h:10
#: ../gtksourceview/language-specs/html.lang.h:7
#: ../gtksourceview/language-specs/latex.lang.h:7
#: ../gtksourceview/language-specs/texinfo.lang.h:12
@@ -953,6 +972,18 @@ msgstr "HTML"
msgid "Markup"
msgstr "Markup"
+#: ../gtksourceview/language-specs/docbook.lang.h:12
+msgid "Structural Elements"
+msgstr "Structural Elements"
+
+#: ../gtksourceview/language-specs/html.lang.h:4
+msgid "DTD"
+msgstr "DTD"
+
+#: ../gtksourceview/language-specs/html.lang.h:6
+msgid "HTML"
+msgstr "HTML"
+
#: ../gtksourceview/language-specs/html.lang.h:9
#: ../gtksourceview/language-specs/xml.lang.h:8
msgid "Tag"
@@ -1063,18 +1094,23 @@ msgid "Flow"
msgstr "Flow"
#: ../gtksourceview/language-specs/java.lang.h:4
+#: ../gtksourceview/language-specs/javascript.lang.h:7
+msgid "Future Reserved Words"
+msgstr "Future Reserved Words"
+
+#: ../gtksourceview/language-specs/java.lang.h:5
msgid "Java"
msgstr "Java"
-#: ../gtksourceview/language-specs/java.lang.h:6
+#: ../gtksourceview/language-specs/java.lang.h:7
msgid "Memory"
msgstr "Memory"
-#: ../gtksourceview/language-specs/java.lang.h:7
+#: ../gtksourceview/language-specs/java.lang.h:8
msgid "Modifiers"
msgstr "Modifiers"
-#: ../gtksourceview/language-specs/java.lang.h:8
+#: ../gtksourceview/language-specs/java.lang.h:9
msgid "Numeric"
msgstr "Numeric"
@@ -1099,10 +1135,6 @@ msgstr "Floating-Point Number"
msgid "Flow Keywords"
msgstr "Flow Keywords"
-#: ../gtksourceview/language-specs/javascript.lang.h:7
-msgid "Future Reserved Words"
-msgstr "Future Reserved Words"
-
#: ../gtksourceview/language-specs/javascript.lang.h:8
msgid "Global Functions"
msgstr "Global Functions"
@@ -1736,10 +1768,6 @@ msgstr "True and False"
msgid "VHDL"
msgstr "VHDL"
-#: ../gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "Hexadecimal"
-
#: ../gtksourceview/language-specs/xml.lang.h:9
msgid "XML"
msgstr "XML"
diff -pruN 1.8.2-1/po/Makefile.in.in 1.8.3-0ubuntu1/po/Makefile.in.in
--- 1.8.2-1/po/Makefile.in.in 2006-12-13 12:02:59.000000000 +0000
+++ 1.8.3-0ubuntu1/po/Makefile.in.in 2007-01-08 19:49:12.000000000 +0000
@@ -56,7 +56,9 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-USE_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
@@ -64,7 +66,7 @@ DISTFILES = ChangeLog Makefile.in.in POT
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
-#This Gets Replace for some reason
+# This comment gets stripped out
CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
@@ -141,6 +143,11 @@ uninstall:
done
check: all $(GETTEXT_PACKAGE).pot
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
+ fi
mostlyclean:
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
diff -pruN 1.8.2-1/po/nb.po 1.8.3-0ubuntu1/po/nb.po
--- 1.8.2-1/po/nb.po 2006-10-19 09:43:11.000000000 +0100
+++ 1.8.3-0ubuntu1/po/nb.po 2007-01-03 15:40:34.000000000 +0000
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gtksourceview 1.2.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-19 10:35+0200\n"
-"PO-Revision-Date: 2006-10-19 10:41+0200\n"
+"POT-Creation-Date: 2006-12-29 12:57+0100\n"
+"PO-Revision-Date: 2006-12-29 12:58+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
"Language-Team: Norwegian bokmal <i18n-nb lister ping uio no>\n"
"MIME-Version: 1.0\n"
@@ -271,6 +271,7 @@ msgstr "Preprosessor"
#: ../gtksourceview/language-specs/cpp.lang.h:15
#: ../gtksourceview/language-specs/csharp.lang.h:9
#: ../gtksourceview/language-specs/css.lang.h:58
+#: ../gtksourceview/language-specs/docbook.lang.h:11
#: ../gtksourceview/language-specs/html.lang.h:8
#: ../gtksourceview/language-specs/fortran.lang.h:14
#: ../gtksourceview/language-specs/haskell.lang.h:31
@@ -594,6 +595,7 @@ msgstr "«#if 0»-kommentar"
#: ../gtksourceview/language-specs/csharp.lang.h:1
#: ../gtksourceview/language-specs/css.lang.h:9
#: ../gtksourceview/language-specs/d.lang.h:2
+#: ../gtksourceview/language-specs/docbook.lang.h:2
#: ../gtksourceview/language-specs/html.lang.h:2
#: ../gtksourceview/language-specs/haskell.lang.h:1
#: ../gtksourceview/language-specs/idl.lang.h:1
@@ -926,29 +928,46 @@ msgstr "Fjernet linje"
msgid "Special case"
msgstr "Spesialtilfelle"
+#: ../gtksourceview/language-specs/docbook.lang.h:1
#: ../gtksourceview/language-specs/html.lang.h:1
#: ../gtksourceview/language-specs/xml.lang.h:1
msgid "Attribute"
msgstr "Attributt"
+#: ../gtksourceview/language-specs/docbook.lang.h:3
#: ../gtksourceview/language-specs/html.lang.h:3
#: ../gtksourceview/language-specs/xml.lang.h:3
msgid "Closing Bracket"
msgstr "Avsluttende klamme"
-#: ../gtksourceview/language-specs/html.lang.h:4
-msgid "DTD"
-msgstr "DTD"
+#: ../gtksourceview/language-specs/docbook.lang.h:4
+msgid "DocBook"
+msgstr "DocBook"
+#: ../gtksourceview/language-specs/docbook.lang.h:5
#: ../gtksourceview/language-specs/html.lang.h:5
#: ../gtksourceview/language-specs/xml.lang.h:4
msgid "Entity"
msgstr "Entitet"
-#: ../gtksourceview/language-specs/html.lang.h:6
-msgid "HTML"
-msgstr "HTML"
+#: ../gtksourceview/language-specs/docbook.lang.h:6
+msgid "Formatting Elements"
+msgstr "Elementer for formattering"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:7
+msgid "GUI Elements"
+msgstr "GUI-elementer"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:8
+msgid "Header Elements"
+msgstr "Header-elementer"
+#: ../gtksourceview/language-specs/docbook.lang.h:9
+#: ../gtksourceview/language-specs/xml.lang.h:5
+msgid "Hexadecimal"
+msgstr "Heksadesimal"
+
+#: ../gtksourceview/language-specs/docbook.lang.h:10
#: ../gtksourceview/language-specs/html.lang.h:7
#: ../gtksourceview/language-specs/latex.lang.h:7
#: ../gtksourceview/language-specs/texinfo.lang.h:12
@@ -956,6 +975,18 @@ msgstr "HTML"
msgid "Markup"
msgstr "Merking"
+#: ../gtksourceview/language-specs/docbook.lang.h:12
+msgid "Structural Elements"
+msgstr "Strukturelle elementer"
+
+#: ../gtksourceview/language-specs/html.lang.h:4
+msgid "DTD"
+msgstr "DTD"
+
+#: ../gtksourceview/language-specs/html.lang.h:6
+msgid "HTML"
+msgstr "HTML"
+
#: ../gtksourceview/language-specs/html.lang.h:9
#: ../gtksourceview/language-specs/xml.lang.h:8
msgid "Tag"
@@ -1740,10 +1771,6 @@ msgstr "Sann og usann"
msgid "VHDL"
msgstr "VHDL"
-#: ../gtksourceview/language-specs/xml.lang.h:5
-msgid "Hexadecimal"
-msgstr "Heksadesimal"
-
#: ../gtksourceview/language-specs/xml.lang.h:9
msgid "XML"
msgstr "XML"
diff -pruN 1.8.2-1/po/POTFILES.in 1.8.3-0ubuntu1/po/POTFILES.in
--- 1.8.2-1/po/POTFILES.in 2006-07-24 17:07:26.000000000 +0100
+++ 1.8.3-0ubuntu1/po/POTFILES.in 2007-01-08 19:41:49.000000000 +0000
@@ -14,6 +14,7 @@ gtksourceview/language-specs/css.lang
gtksourceview/language-specs/d.lang
gtksourceview/language-specs/desktop.lang
gtksourceview/language-specs/diff.lang
+gtksourceview/language-specs/docbook.lang
gtksourceview/language-specs/html.lang
gtksourceview/language-specs/fortran.lang
gtksourceview/language-specs/gtkrc.lang
@@ -27,6 +28,7 @@ gtksourceview/language-specs/lua.lang
gtksourceview/language-specs/makefile.lang
gtksourceview/language-specs/msil.lang
gtksourceview/language-specs/nemerle.lang
+gtksourceview/language-specs/ocaml.lang
gtksourceview/language-specs/octave.lang
gtksourceview/language-specs/pascal.lang
gtksourceview/language-specs/perl.lang
diff -pruN 1.8.2-1/README 1.8.3-0ubuntu1/README
--- 1.8.2-1/README 2006-12-13 12:01:13.000000000 +0000
+++ 1.8.3-0ubuntu1/README 2007-01-08 19:41:28.000000000 +0000
@@ -1,7 +1,7 @@
General Information
===================
-This is version 1.8.2 of GtkSourceView.
+This is version 1.8.3 of GtkSourceView.
GtkSourceView is a text widget that extends the standard gtk+ 2.x
text widget GtkTextView.
@@ -26,8 +26,8 @@ GtkSourceView requires GTK+-2.8.x, libxm
Simple install procedure:
- % gzip -cd gtksourceview-1.8.2.tar.gz | tar xvf - # unpack the sources
- % cd gtksourceview-1.8.2 # change to the toplevel directory
+ % gzip -cd gtksourceview-1.8.3.tar.gz | tar xvf - # unpack the sources
+ % cd gtksourceview-1.8.3 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build gtksourceview
[ Become root if necessary ]
diff -pruN 1.8.2-1/tests/Makefile.in 1.8.3-0ubuntu1/tests/Makefile.in
--- 1.8.2-1/tests/Makefile.in 2006-12-13 12:03:11.000000000 +0000
+++ 1.8.3-0ubuntu1/tests/Makefile.in 2007-01-08 19:49:16.000000000 +0000
@@ -126,6 +126,7 @@ GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GNOME_PRINT_REQUIRED_VERSION = @GNOME_PRINT_REQUIRED_VERSION@
GNOME_VFS_REQUIRED_VERSION = @GNOME_VFS_REQUIRED_VERSION@
+GREP = @GREP@
GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -200,13 +201,9 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -223,23 +220,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
